From 3dfd80fb0dd27ab73c75cded7880db8dfe2d1ae4 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sun, 17 Jan 1999 05:47:10 +0000 Subject: [PATCH] * mdemo/Makefile.am (../libltdl/libltdlc.la): depend on ../libtool, because ../libltdl/libtool depends on it (mdemo_debug_*): copy from mdemo_*, adding -static to LDFLAGS --- ChangeLog | 4 ++++ mdemo/Makefile.am | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72e6a7f4b..0ce9c1861 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 1999-01-17 Alexandre Oliva + * 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 14d63e117..84e5eeb8f 100644 --- 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) -- 2.47.2