Consistently include Makeconfig after defining subdir

[Stefan Liebler]

On 02/27/2014 06:56 PM, Joseph S. Myers wrote:
> On Thu, 27 Feb 2014, Stefan Liebler wrote:
>
>> 2014-02-27  Stefan Liebler  <stli@linux.vnet.ibm.com>
>>
>> 	* csu/Makefile: Use += instead of a =.
>
> OK (with the ChangeLog entry fixed to name the variable involved).
>
> I think the same should apply to other directories setting before-compile
> with = or :=, unless they have a good reason for doing so.  (That's elf/
> iconvdata/ intl/ posix/.  None were actually affected by my patch because
> they had the settings of before-compile below both the old and new
> includes of Makeconfig.)
>

I changed the other Makefiles, too.
Afterwards i successfully tested on S390/S390x.

Bye

---
2014-02-28  Stefan Liebler  <stli@linux.vnet.ibm.com>

	* csu/Makefile: Use += before-compile instead of a = or :=.
	* elf/Makefile: Likewise.
	* iconvdata/Makefile: Likewise.
	* intl/Makefile: Likewise.
	* posix/Makefile: Likewise.
---

-------------- next part --------------
diff --git a/csu/Makefile b/csu/Makefile
index ebd4b4e..e32363c 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -40,7 +40,7 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
 			     S$(start-installed-name))
 install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
 generated = version-info.h
-before-compile = $(objpfx)version-info.h
+before-compile += $(objpfx)version-info.h
 
 tests := tst-empty tst-atomic tst-atomic-long
 tests-static := tst-empty
diff --git a/elf/Makefile b/elf/Makefile
index 3b217ce..171273b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -55,7 +55,7 @@ routines += unwind-dw2-fde-glibc
 shared-only-routines += unwind-dw2-fde-glibc
 endif
 
-before-compile  = $(objpfx)trusted-dirs.h
+before-compile  += $(objpfx)trusted-dirs.h
 generated	:= trusted-dirs.h trusted-dirs.st for-renamed/renamed.so
 generated-dirs	:= for-renamed
 
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 01f50d2..eb16310 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -202,7 +202,7 @@ touch $@
 endef
 
 # The headers must be generated before the compilation.
-before-compile = $(addprefix $(objpfx),$(generated-modules:=.h))
+before-compile += $(addprefix $(objpfx),$(generated-modules:=.h))
 
 ifndef avoid-generated
 $(objpfx)iconv-rules: Makefile
diff --git a/intl/Makefile b/intl/Makefile
index b21f4d9..3bfc4ef 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -34,7 +34,7 @@ test-srcs += $(multithread-test-srcs)
 endif
 tests = tst-ngettext
 
-before-compile = $(objpfx)msgs.h
+before-compile += $(objpfx)msgs.h
 
 install-others = $(inst_msgcatdir)/locale.alias
 
diff --git a/posix/Makefile b/posix/Makefile
index b41055a..91062b4 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -98,7 +98,7 @@ others		:= getconf
 install-bin	:= getconf
 install-others-programs	:= $(inst_libexecdir)/getconf
 
-before-compile	:= testcases.h ptestcases.h
+before-compile	+= testcases.h ptestcases.h
 
 # So they get cleaned up.
 generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \