* */configure.in: AC_SUBST(LIBTOOL_DEPS)

* */Makefile.am $(OBJECTS): depend on libtool
(libtool): rebuild automatically

diff --git a/ChangeLog b/ChangeLog
index ff5107006f5ee602ed577d5dfac5cc88a8ff0705..5b71e3e2b98b88d32443d62a57f017167b70def6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-03-11  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * */configure.in: AC_SUBST(LIBTOOL_DEPS)
+       * */Makefile.am $(OBJECTS): depend on libtool
+       (libtool): rebuild automatically
+
        * ltconfig.in: set dlopen_* variables to unknown when appropriate
        * ltmain.in: only emit warning about lack of AC_LIBTOOL_DLOPEN if
        *all* dlopen_* variables are set to unknown

diff --git a/cdemo/Makefile.am b/cdemo/Makefile.am
index 8e9a844a8ac22db166b616744c082aa66a890dac..4fe0994716e8c494ada2f7f00bab935cbb951493 100644 (file)
--- a/cdemo/Makefile.am
+++ b/cdemo/Makefile.am
@@ -14,3 +14,7 @@ bin_PROGRAMS = cdemo
 
 cdemo_SOURCES = main.c
 cdemo_LDADD = libfoo.la
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status --recheck

diff --git a/cdemo/configure.in b/cdemo/configure.in
index e39ca3c4b2c6ee725dafe236f803cce00dd5ece4..cf28fa653f3cae9ce25278a3503630ca654bffd6 100644 (file)
--- a/cdemo/configure.in
+++ b/cdemo/configure.in
@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE(cdemo,0.1)
 AC_PROG_CC
 AC_EXEEXT
 AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 
 AC_CHECK_HEADERS(math.h)
 

diff --git a/demo/Makefile.am b/demo/Makefile.am
index cd3ea84b76f78b60e5e8b354e216e69924b3fb02..8b5413b391fad02978cd2b0491f5323af3690012 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -108,3 +108,7 @@ hc-libpath: $(hell_OBJECTS) $(hell_DEPENDENCIES)
 hc-minusL: $(hell_OBJECTS) $(hell_DEPENDENCIES)
        @rm -f hc-minusL
        $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -L./$(objdir) -lhello -lm
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status --recheck

diff --git a/demo/configure.in b/demo/configure.in
index 498879ca9c52f9e258f54cad6065e8ee9c759ac1..2641d8614b89505f1b0e2010a05d0bdcf33ba0e4 100644 (file)
--- a/demo/configure.in
+++ b/demo/configure.in
@@ -7,6 +7,7 @@ AC_C_CONST
 AC_EXEEXT
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 
 if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
   STATIC=-static

diff --git a/depdemo/Makefile.am b/depdemo/Makefile.am
index 9c59e280aade8aac09c04ad7cbee125ece5694f8..ccf3891aeab912a6149dbfbc067d73cf15461ca8 100644 (file)
--- a/depdemo/Makefile.am
+++ b/depdemo/Makefile.am
@@ -23,3 +23,7 @@ depdemo_static_LDADD = libl1.la libl2.la libl4.la \
                libl3.la # remove this!
 depdemo_static_DEPENDENCIES = libl1.la libl2.la libl4.la
 depdemo_static_LDFLAGS = -static
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status --recheck

diff --git a/depdemo/configure.in b/depdemo/configure.in
index 3c5fe3b512945933ecc3f258aa92cf2fadcb8c2b..67438a7190a96c731cfddf6917f30d9b3491cea6 100644 (file)
--- a/depdemo/configure.in
+++ b/depdemo/configure.in
@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE(depdemo,0.1)
 AC_PROG_CC
 AC_EXEEXT
 AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 
 AC_CHECK_HEADERS(math.h)
 

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 4c2ebd572ddba628081dfc751583bf19838404fc..fd4e05e26ac9e1849f0c79a19a5aa9d72ba832b0 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -20,6 +20,6 @@ libltdl_la_LIBADD = $(LIBADD_DL)
 libltdlc_la_SOURCES = ltdl.c
 libltdlc_la_LIBADD = $(LIBADD_DL)
 
+$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
-Makefile: libtool

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 8db9963f678694553561be7fd74a829653917140..67806b8870cfb69f7cc061e89b015dd5b37abb3c 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -29,8 +29,7 @@ bin_PROGRAMS = mdemo mdemo.static
 
 # Create a version of mdemo that does dlopen.
 mdemo_SOURCES = main.c
-mdemo_LDFLAGS = -export-dynamic ## FIXME: remove this when libtool and libltdl
-## handle dependencies of modules
+mdemo_LDFLAGS = -export-dynamic
 ## The quotes around -dlopen below fool automake into accepting it
 mdemo_LDADD = @LIBLTDL@ "-dlopen" self \
                "-dlopen" foo1.la "-dlopen" libfoo2.la
@@ -41,3 +40,7 @@ mdemo_static_SOURCES = $(mdemo_SOURCES)
 mdemo_static_LDFLAGS = $(STATIC) $(mdemo_LDFLAGS)
 mdemo_static_LDADD = $(mdemo_LDADD)
 mdemo_static_DEPENDENCIES = $(mdemo_DEPENDENCIES)
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status --recheck

diff --git a/mdemo/configure.in b/mdemo/configure.in
index 28aba7b8283af9b7d2eff6e69651ca87e68123d3..1c17ed5bc8f2ba6edbb05b6299979619bcf98989 100644 (file)
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -7,6 +7,7 @@ AC_C_CONST
 AC_EXEEXT
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 
 dnl AC_LIBLTDL_CONVENIENCE(['${top_builddir}/../libltdl'])
 dnl Since the package is flat, we need not use the line above,