Fix for parallel makes.

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index f011e00fac264520bce55257df34c6a4f3d4b46f..a050f110e4c2813ef09eec048c64e229b05ac646 100644 (file)
--- 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 3b459e00d4386b0c5b6bdac82ddedcfead776df0..dee5c2b66c734f810b65babd3b2adb06100b6af6 100644 (file)
--- 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 \