rework dependencies so the archive is re-created only when the object files have been updated

7 files changed, 15 insertions, 30 deletions

diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index 2f90adedb..777b43475 100644
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -70,11 +70,11 @@ endif
 #This stuff will not work with -fomit-frame-pointer
 XXFLAGS := $(XXFLAGS:-fomit-frame-pointer=)
 
-all: lib
+all: $(LDSO_FULLNAME)
 
-lib:: $(OBJS) $(DLINK_OBJS)
+$(LDSO_FULLNAME): $(OBJS) $(DLINK_OBJS)
 	$(LD) $(LDFLAGS) -e _dl_boot -soname=$(UCLIBC_LDSO) \
-		-o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC);
+		-o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(INSTALL) -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
 	$(LN) -sf $(LDSO_FULLNAME) $(TOPDIR)lib/$(UCLIBC_LDSO)
diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index 497e5307c..ec860dc18 100644
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -33,11 +33,9 @@ LIBCRYPT_SHARED_FULLNAME=libcrypt-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).
 CSRC = crypt.c des.c md5.c
 OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-all: $(OBJS) $(LIBCRYPT)
+all: $(LIBCRYPT)
 
-$(LIBCRYPT): ar-target
-
-ar-target: $(OBJS)
+$(LIBCRYPT) ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBCRYPT)
diff --git a/libintl/Makefile b/libintl/Makefile
index 8dd084dc5..abb9c8fd3 100644
--- a/libintl/Makefile
+++ b/libintl/Makefile
@@ -23,7 +23,6 @@
 
 TOPDIR=../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CFLAGS+=$(SSP_ALL_CFLAGS)
 
@@ -38,11 +37,9 @@ MOBJ= gettext.o ngettext.o  dgettext.o dcgettext.o dngettext.o dcngettext.o \
 
 OBJS=$(MOBJ)
 
-all: $(OBJS) $(LIBC)
+all: $(LIBINTL)
 
-$(LIBC): ar-target
-
-ar-target: $(OBJS)
+$(LIBINTL) ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBINTL) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBINTL)
diff --git a/libnsl/Makefile b/libnsl/Makefile
index 915651063..3550d0c23 100644
--- a/libnsl/Makefile
+++ b/libnsl/Makefile
@@ -28,11 +28,9 @@ LIBNSL_SHARED_FULLNAME=libnsl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 CSRC = nsl.c
 OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-all: $(OBJS) $(LIBNSL)
+all: $(LIBNSL)
 
-$(LIBNSL): ar-target
-
-ar-target: $(OBJS)
+$(LIBNSL) ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBNSL) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBNSL)
diff --git a/libresolv/Makefile b/libresolv/Makefile
index 510457b87..32ca32d71 100644
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -34,11 +34,9 @@ LIBRESOLV_SHARED_FULLNAME=libresolv-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL
 CSRC = resolv.c
 OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-all: $(OBJS) $(LIBRESOLV)
+all: $(LIBRESOLV)
 
-$(LIBRESOLV): ar-target
-
-ar-target: $(OBJS)
+$(LIBRESOLV) ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBRESOLV) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBRESOLV)
diff --git a/librt/Makefile b/librt/Makefile
index b84520af3..10b371cb7 100644
--- a/librt/Makefile
+++ b/librt/Makefile
@@ -4,7 +4,6 @@
 
 TOPDIR=../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 LIBRT=librt.a
 LIBRT_SHARED=librt.so
@@ -18,11 +17,9 @@ CSRC=mq_open.c mq_close.c mq_unlink.c mq_getsetattr.c \
      timer_settime.c timer_gettime.c timer_getoverr.c
 OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-all: $(OBJS) $(LIBC)
+all: $(LIBRT)
 
-$(LIBC): ar-target
-
-ar-target: $(OBJS)
+$(LIBRT) ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBRT) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBRT)
diff --git a/libutil/Makefile b/libutil/Makefile
index 59176c903..8affcfde2 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -23,7 +23,6 @@
 
 TOPDIR=../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CFLAGS+=$(SSP_ALL_CFLAGS)
 
@@ -37,11 +36,9 @@ ifeq ($(strip $(ARCH_HAS_MMU)),y)
 endif
 OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-all: $(OBJS) $(LIBC)
+all: $(LIBUTIL)
 
-$(LIBC): ar-target
-
-ar-target: $(OBJS)
+$(LIBUTIL) ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBUTIL) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBUTIL)