From d3dfcc4187a4e790d72ede37f8241a25adeb2483 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 3 May 2012 09:52:29 -0700 Subject: Fix make clean for recent elf/Makefile changes. --- ChangeLog | 6 ++++++ elf/Makefile | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6795cbb82..db2f8bd29c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-03 Roland McGrath + + * 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 * sysdeps/i386/fpu/libm-test-ulps: Update. diff --git a/elf/Makefile b/elf/Makefile index 47729c37ff..8743ee0ceb 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,\ -- cgit v1.2.3