* mdemo/Makefile.am (../libltdl/libltdlc.la): depend on

	../libtool, because ../libltdl/libtool depends on it
	(mdemo_debug_*): copy from mdemo_*, adding -static to LDFLAGS

diff --git a/ChangeLog b/ChangeLog
index 72e6a7f4b37d659aad718ab440c876b690124f72..0ce9c18617d2ace1b1e894ed903da089eb96ced2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-01-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * mdemo/Makefile.am (../libltdl/libltdlc.la): depend on
+       ../libtool, because ../libltdl/libtool depends on it
+       (mdemo_debug_*): copy from mdemo_*, adding -static to LDFLAGS
+
        * ltmain.in (dlpredeps): append dependencies from dlopened modules 
        (but not dlpreopened ones) after all explicitly linked libraries
 

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 14d63e117b7a64aae2a00d00b607ff6671f10511..84e5eeb8fd0a20911f32c7e22f9aca17a681bb00 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -18,7 +18,7 @@ noinst_HEADERS = foo.h
 
 bin_PROGRAMS = mdemo mdemo.debug
 
-../libltdl/libltdlc.la: ../libltdl/libtool \
+../libltdl/libltdlc.la: ../libtool ../libltdl/libtool \
     $(srcdir)/../libltdl/ltdl.c $(srcdir)/../libltdl/ltdl.h
        (cd ../libltdl; $(MAKE) libltdlc.la)
 
@@ -26,14 +26,12 @@ bin_PROGRAMS = mdemo mdemo.debug
 mdemo_SOURCES = main.c
 mdemo_LDADD = ../libltdl/libltdlc.la
 mdemo_LDFLAGS = -dlopen foo1.la -dlopen libfoo2.la \
-       -export-dynamic # FIXME: remove this when libtool and libltdl \
-                       # handle dependencies of modules
+       -export-dynamic ## FIXME: remove this when libtool and libltdl
+## handle dependencies of modules
 mdemo_DEPENDENCIES = ../libltdl/libltdlc.la foo1.la libfoo2.la
 
 # Create an easier-to-debug version of mdemo.
-mdemo_debug_SOURCES = main.c
-mdemo_debug_LDADD = ../libltdl/libltdlc.la
-mdemo_debug_LDFLAGS = -static -dlopen foo1.la -dlopen libfoo2.la \
-       -export-dynamic # FIXME: remove this when libtool and libltdl \
-                       # handle dependencies of modules
-mdemo_debug_DEPENDENCIES = ../libltdl/libltdlc.la foo1.la libfoo2.la
+mdemo_debug_SOURCES = $(mdemo_SOURCES)
+mdemo_debug_LDADD = $(mdemo_LDADD)
+mdemo_debug_LDFLAGS = -static $(mdemo_LDFLAGS)
+mdemo_debug_DEPENDENCIES = $(mdemo_DEPENDENCIES)