Ensure alloca.h and stdbool.h are created before compiling the library.

diff --git a/ChangeLog b/ChangeLog
index dad9ffc19664cf6c6c586869341ff307072b7659..e8292c5996cddce67aa0e1323d8d59833022c068 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-11  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_create_testdir): Substitute lib_OBJECTS.
+       * modules/alloca (Makefile.am): All object files depend on alloca.h.
+       * modules/stdbool (Makefile.am): All object files depend on stdbool.h.
+
 2003-01-12  Paul Eggert  <eggert@twinsun.com>
 
        Finish renaming getstr -> getdelim2 and readline -> readlinebuffer,

diff --git a/gnulib-tool b/gnulib-tool
index 803a2038a1f8653790b0adfac4b525db991dec85..10308918b3350d7e2d56ce1a3df1197612fbaa03 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2003-01-09 13:22:53 $'
+cvsdatestamp='$Date: 2003-01-13 16:03:12 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -348,7 +348,7 @@ func_create_testdir ()
    for module in $modules; do
      func_verify_module
      if test -n "$module"; then
-       func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g'
+       func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
        if test "$module" = 'alloca'; then
          echo "$libname"'_a_LIBADD += @ALLOCA@'
          echo '#'"$libname"'_la_LIBADD += @LTALLOCA@'

diff --git a/modules/alloca b/modules/alloca
index 42a0583fa91a22ed0cc64d666e347cb9ace5860c..a18f3f5dd6519ac9dbe05f35e7c031ef574be7e5 100644 (file)
--- a/modules/alloca
+++ b/modules/alloca
@@ -17,7 +17,7 @@ EXTRA_DIST += alloca_.h
 
 # The following is needed in order to create an <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-all-local: @ALLOCA_H@
+all-local $(lib_OBJECTS): @ALLOCA_H@
 alloca.h: alloca_.h
        cp $(srcdir)/alloca_.h alloca.h
 MOSTLYCLEANFILES += alloca.h

diff --git a/modules/stdbool b/modules/stdbool
index bda2d93692aefa32419f8f192ecea4758bc8e414..c3f1d30fc7063ab5b7e027d24d103d03e9485e96 100644 (file)
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -14,7 +14,7 @@ EXTRA_DIST += stdbool.h.in
 
 # The following is needed in order to create an <stdbool.h> when the system
 # doesn't have one that works.
-all-local: @STDBOOL_H@
+all-local $(lib_OBJECTS): @STDBOOL_H@
 stdbool.h: stdbool.h.in
        sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/stdbool.h.in > stdbool.h
 MOSTLYCLEANFILES += stdbool.h