From bf765e60dd2786516485c48ed81b120ef4de680f Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 4 Jun 2008 14:57:16 +0000 Subject: - 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. --- libpthread/linuxthreads.old/Makefile.in | 25 +++++++++++-------------- libpthread/linuxthreads.old_db/Makefile.in | 4 ++-- libpthread/linuxthreads/Makefile.in | 25 +++++++++++-------------- libpthread/linuxthreads_db/Makefile.in | 4 ++-- 4 files changed, 26 insertions(+), 32 deletions(-) (limited to 'libpthread') 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/ -- cgit v1.2.3