- strip the targets and not prerequisites

- tidy up PTHREADS_DEBUG_SUPPORT by using per-target STRIP_FLAGS for the few

  This fixes the spurious rebuilds bernd and vda were seeing with libpthreads.

15 files changed, 46 insertions, 52 deletions

diff --git a/Makerules b/Makerules
index dcc84d6a7..b8ef1be59 100644
--- a/Makerules
+++ b/Makerules
@@ -318,14 +318,14 @@ $(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC): | headers
 $(top_builddir)lib/$(NONSHARED_LIBNAME): $(libc-nonshared-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(top_builddir)lib/libpthread_nonshared.a: $(libpthread-nonshared-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 files.dep := $(libc-a-y) $(libc-so-y) $(libc-nonshared-y) \
 	$(libm-a-y) $(libm-so-y) \
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 5ae985a61..23dafc7a1 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -55,8 +55,8 @@ $(ldso:.$(MAJOR_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
 
 $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(UCLIBC_LDSO_NAME)_clean:
 	$(RM) $($(UCLIBC_LDSO_NAME)_OUT)/*.{o,os,oS,a} $($(UCLIBC_LDSO_NAME)_OUT)/*/*.{o,os,oS}
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index 82afb67b9..cf21f7b96 100644
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -46,14 +46,14 @@ $(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc.depend)
 
 $(libdl_OUT)/libdl_so.a: $(libdl-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(top_builddir)lib/libdl.a: $(libdl-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 libdl_clean:
 	$(RM) $(libdl_OUT)/*.{o,os,a,oS}
diff --git a/libc/Makefile.in b/libc/Makefile.in
index 11224bbe0..db02bd7fe 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -90,8 +90,8 @@ $(libc_OUT)/libc.oS: $(libc-multi-y) | $(top_builddir)lib/libc.a $(top_builddir)
 $(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 # We use libc_so.a so that we can compile the shared library with special
 # flags - i.e. -mleaf-id-shared-library.  The static libc.a needs to be
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index 40bb55cd0..40a73d1c8 100644
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -44,8 +44,8 @@ endif
 
 $(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libcrypt_OUT)/libcrypt.oS: $(libcrypt_SRC)
 	$(Q)$(RM) $@
@@ -55,8 +55,8 @@ $(libcrypt_OUT)/libcrypt.oS: $(libcrypt_SRC)
 $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 libcrypt_clean:
 	$(RM) $(libcrypt_OUT)/*.{o,os,oS,a}
diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index 8a64a7615..1c594c8fc 100644
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -53,8 +53,8 @@ endif
 
 $(libintl_OUT)/libintl_so.a: $(libintl-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libintl_OUT)/libintl.oS: $(libintl_MSRC)
 	$(Q)$(RM) $@
@@ -64,8 +64,8 @@ $(libintl_OUT)/libintl.oS: $(libintl_MSRC)
 $(top_builddir)lib/libintl.a: $(libintl-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libintl_MOBJ): $(libintl_MSRC)
 	$(compile.m)
diff --git a/libm/Makefile.in b/libm/Makefile.in
index 0e76408ab..ae591ebfb 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -164,8 +164,8 @@ endif
 
 $(libm_OUT)/libm_so.a: $(libm-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libm_OUT)/libm.oS: $(libm_SRC) $(libm_MSRC) $(libm_ARCH_SRC)
 	$(Q)$(RM) $@
@@ -175,8 +175,8 @@ $(libm_OUT)/libm.oS: $(libm_SRC) $(libm_MSRC) $(libm_ARCH_SRC)
 $(top_builddir)lib/libm.a: $(libm-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libm_MOBJ): $(libm_MSRC)
 	$(compile.m)
diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in
index 4bc6162f8..0707a6547 100644
--- a/libnsl/Makefile.in
+++ b/libnsl/Makefile.in
@@ -39,14 +39,14 @@ endif
 
 $(libnsl_OUT)/libnsl_so.a: $(libnsl-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(top_builddir)lib/libnsl.a: $(libnsl-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 libnsl_clean:
 	$(RM) $(libnsl_OUT)/*.{o,os,a}
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 9d05383d3..fe7503bae 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -83,33 +83,30 @@ $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depen
 #	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
 #endif
 
-$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
-	$(Q)$(RM) $@
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(do_strip:-x=-X --strip-debug)
-else
-	$(do_strip)
+$(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
 endif
+$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
+	$(Q)$(RM) $@
 	$(do_ar)
+	$(do_t_strip)
 
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+endif
 $(libpthread_OUT)/libpthread.oS: $(libpthread_SRC) $(libpthread_SPEC_SRC)
 	$(Q)$(RM) $@
 	$(compile-m)
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(do_t_strip:-x=-X --strip-debug)
-else
 	$(do_t_strip)
-endif
 
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+$(top_builddir)lib/libpthread.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+endif
 $(top_builddir)lib/libpthread.a: $(libpthread-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(do_strip:-x=-X --strip-debug)
-else
-	$(do_strip)
-endif
 	$(do_ar)
+	$(do_t_strip)
 
 linuxthreads_headers:
 	$(Q)$(LN) -sf ../$(PTDIR)/sysdeps/pthread/pthread.h $(top_builddir)include/
diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index b259b631b..996ef2fb2 100644
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -51,8 +51,8 @@ endif
 
 $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
 	$(Q)$(RM) $@
@@ -62,8 +62,8 @@ $(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
 $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 linuxthreads_db_headers:
 	$(Q)$(LN) -sf ../$(PTDIR)_db/thread_db.h $(top_builddir)include/
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in
index e786e176e..d51da51fa 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@@ -96,33 +96,30 @@ $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depen
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
 	$(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
 
-$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
-	$(Q)$(RM) $@
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(do_strip:-x=-X --strip-debug)
-else
-	$(do_strip)
+$(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
 endif
+$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
+	$(Q)$(RM) $@
 	$(do_ar)
+	$(do_t_strip)
 
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+endif
 $(libpthread_OUT)/libpthread.oS: $(libpthread_SRC)
 	$(Q)$(RM) $@
 	$(compile-m)
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(do_t_strip:-x=-X --strip-debug)
-else
 	$(do_t_strip)
-endif
 
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+$(top_builddir)lib/libpthread.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+endif
 $(top_builddir)lib/libpthread.a: $(libpthread-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(do_strip:-x=-X --strip-debug)
-else
-	$(do_strip)
-endif
 	$(do_ar)
+	$(do_t_strip)
 
 linuxthreads_headers:
 	$(Q)$(LN) -sf ../$(PTDIR)/sysdeps/pthread/pthread.h $(top_builddir)include/
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in
index 56c2d112f..3a93d58d4 100644
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@@ -51,8 +51,8 @@ endif
 
 $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
 	$(Q)$(RM) $@
@@ -62,8 +62,8 @@ $(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
 $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 linuxthreads_db_headers:
 	$(Q)$(LN) -sf ../$(PTDIR)_db/thread_db.h $(top_builddir)include/
diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index f0c9a980a..e86af747d 100644
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -39,14 +39,14 @@ endif
 
 $(libresolv_OUT)/libresolv_so.a: $(libresolv-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(top_builddir)lib/libresolv.a: $(libresolv-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 libresolv_clean:
 	$(RM) $(libresolv_OUT)/*.{o,os,a}
diff --git a/librt/Makefile.in b/librt/Makefile.in
index c91552acc..14bff70ef 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -40,14 +40,14 @@ endif
 
 $(librt_OUT)/librt_so.a: $(librt-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(top_builddir)lib/librt.a: $(librt-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 objclean-y += librt_clean
 
diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index 1c4b910ba..f96d079b7 100644
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@@ -51,8 +51,8 @@ endif
 
 $(libutil_OUT)/libutil_so.a: $(libutil-so-y)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 $(libutil_OUT)/libutil.oS: $(libutil_SRC)
 	$(Q)$(RM) $@
@@ -62,8 +62,8 @@ $(libutil_OUT)/libutil.oS: $(libutil_SRC)
 $(top_builddir)lib/libutil.a: $(libutil-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
-	$(do_strip)
 	$(do_ar)
+	$(do_t_strip)
 
 libutil_clean:
 	$(RM) $(libutil_OUT)/*.{o,os,oS,a}