From: Bruno Haible <bruno@clisp.org>
Date: Mon, 27 Nov 2006 17:50:27 +0000 (+0000)
Subject: Fix for parallel makes.
X-Git-Tag: v0.16.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45ea5b2bbebea41f2251e3981042d99c6e5f4104;p=thirdparty%2Fgettext.git

Fix for parallel makes.
---

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index f011e00fa..a050f110e 100644
--- a/gettext-tools/libgettextpo/ChangeLog
+++ b/gettext-tools/libgettextpo/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-28  Bruno Haible  <bruno@clisp.org>
+
+	Fix for parallel makes.
+	* Makefile.am (BUILT_SOURCES): Don't add config.h.
+	(all, check, install): Depend on config.h.
+	(config.h): Depend on the BUILT_SOURCES. Don't invoke make recursively.
+	Reported by Ralf Wildenhues.
+
 2006-10-26  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.16 released.
diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 3b459e00d..dee5c2b66 100644
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -108,8 +108,8 @@ endif
 
 # Hide symbols that are defined by libgettextpo_la_AUXSOURCES or libgnu.la
 # from the global namespace, by prefixing them with "libgettextpo_".
-BUILT_SOURCES += config.h
-config.h:
+all check install: config.h
+config.h: $(BUILT_SOURCES)
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  : "Avoid double inclusion, to avoid a warning about redefinition of DLL_VARIABLE."; \
 	  echo '#ifndef GTPO_CONFIG_H'; \
@@ -125,7 +125,6 @@ config.h:
 	  echo; \
 	  echo '#endif /* GTPO_CONFIG_H */'; \
 	} > config.h && \
-	{ $(MAKE) $(BUILT_SOURCES) || { rm -f config.h; exit 1; }; } && \
 	if test -n "$(HAVE_GLOBAL_SYMBOL_PIPE)"; then \
 	  { \
 	    for f in $(libgettextpo_la_AUXSOURCES) $(libgnu_la_SOURCES) $(libgnu_la_LIBADD); do \