From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 3 May 2012 16:52:29 +0000 (-0700)
Subject: Fix make clean for recent elf/Makefile changes.
X-Git-Tag: glibc-2.16-tps~487
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3dfcc4187a4e790d72ede37f8241a25adeb2483;p=thirdparty%2Fglibc.git

Fix make clean for recent elf/Makefile changes.
---

diff --git a/ChangeLog b/ChangeLog
index c6795cbb822..db2f8bd29c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-03  Roland McGrath  <roland@hack.frob.com>
+
+	* elf/Makefile (common-generated): Set this instead of generated for
+	.dyn, .phdr, .jmprel files.  Remove $(common-objpfx) from the
+	$(all-built-dso)-derived lists.
+
 2012-05-03  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Update.
diff --git a/elf/Makefile b/elf/Makefile
index 47729c37ff6..8743ee0ceba 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -899,7 +899,7 @@ $(all-built-dso:=.dyn): %.dyn: %
 	LC_ALL=C $(READELF) -W -d $< > $@T
 	test -s $@T
 	mv -f $@T $@
-generated += $(all-built-dso:=.dyn)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.dyn)
 
 $(objpfx)check-textrel.out: $(..)scripts/check-textrel.awk \
 			    $(all-built-dso:=.dyn)
@@ -925,7 +925,7 @@ $(all-built-dso:=.phdr): %.phdr: %
 	LC_ALL=C $(READELF) -W -l $< > $@T
 	test -s $@T
 	mv -f $@T $@
-generated += $(all-built-dso:=.phdr)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.phdr)
 
 $(objpfx)check-execstack.out: $(..)scripts/check-execstack.awk \
 			      $(objpfx)execstack-default \
@@ -941,7 +941,7 @@ $(all-built-dso:=.jmprel): %.jmprel: % Makefile
 	LC_ALL=C $(READELF) -W -S -d -r $< > $@T
 	test -s $@T
 	mv -f $@T $@
-generated += $(all-built-dso:=.jmprel)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.jmprel)
 
 check-data := $(firstword $(wildcard \
 		$(foreach D,$(add-ons) scripts,\