From c7c23418fd2dbc8b71cd39952119447d9f079a1c Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Thu, 11 Mar 1999 21:28:36 +0000 Subject: [PATCH] * */configure.in: AC_SUBST(LIBTOOL_DEPS) * */Makefile.am $(OBJECTS): depend on libtool (libtool): rebuild automatically --- ChangeLog | 4 ++++ cdemo/Makefile.am | 4 ++++ cdemo/configure.in | 1 + demo/Makefile.am | 4 ++++ demo/configure.in | 1 + depdemo/Makefile.am | 4 ++++ depdemo/configure.in | 1 + libltdl/Makefile.am | 2 +- mdemo/Makefile.am | 7 +++++-- mdemo/configure.in | 1 + 10 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff5107006..5b71e3e2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 1999-03-11 Alexandre Oliva + * */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 8e9a844a8..4fe099471 100644 --- 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 e39ca3c4b..cf28fa653 100644 --- 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 cd3ea84b7..8b5413b39 100644 --- 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 498879ca9..2641d8614 100644 --- 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 9c59e280a..ccf3891ae 100644 --- 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 3c5fe3b51..67438a719 100644 --- 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 4c2ebd572..fd4e05e26 100644 --- 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 8db9963f6..67806b887 100644 --- 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 28aba7b82..1c17ed5bc 100644 --- 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, -- 2.47.3