summaryrefslogtreecommitdiff
path: root/libresolv
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-11 23:05:36 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-11 23:05:36 +0000
commit998913a5ce37f97c69be8ee7f57a3ad8478c8a80 (patch)
tree20768f292f19cfdc8f3767efa9cc62afe95b1dcd /libresolv
parent99720814c3efa11dd1df59c4bd978e73b6f1ba18 (diff)
Do not defer expansions where useless, like CSRC/OBJS/LIB_NAME/AR_LIB_NAME, defer only for shared lib related stuff, because it is optional. Run STRIPTOOL only once. More use of /$^/$<.
Diffstat (limited to 'libresolv')
-rw-r--r--libresolv/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/libresolv/Makefile b/libresolv/Makefile
index e32f1dd8c..f1055b0e5 100644
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -26,14 +26,14 @@ include $(TOPDIR)Rules.mak
CFLAGS+=$(SSP_ALL_CFLAGS)
-LIB_NAME=libresolv
-AR_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+LIB_NAME := libresolv
+AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
+SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
+SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-CSRC = $(wildcard *.c)
+CSRC := $(wildcard *.c)
-OBJS=$(patsubst %.c,%.o, $(CSRC))
+OBJS := $(patsubst %.c,%.o, $(CSRC))
ifeq ($(strip $(HAVE_SHARED)),y)
all: $(SO_LIB_NAME)
@@ -43,21 +43,21 @@ endif
$(AR_LIB_NAME): $(OBJS)
$(INSTALL) -d $(TOPDIR)lib
- $(RM) $(AR_LIB_NAME)
- $(AR) $(ARFLAGS) $(AR_LIB_NAME) $(OBJS)
+ $(RM) $@
+ $(STRIPTOOL) -x -R .note -R .comment $^
+ $(AR) $(ARFLAGS) $@ $^
$(SO_LIB_NAME): $(AR_LIB_NAME)
- $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $(SO_LIB_NAME)
+ $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
- -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $(AR_LIB_NAME) \
+ -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
- $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME)
+ $(LN) -sf $(SO_FULL_NAME) $@
$(OBJS): %.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
- $(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
$(RM) *.o *~ core