From: Ralf Wildenhues Date: Fri, 3 Feb 2006 09:37:04 +0000 (+0000) Subject: * tests/cdemo/Makefile.am: Remove broken use of undocumented X-Git-Tag: release-2-1b~330 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b4fbf5dd2dab06074360af3ed49c0c9e4d746f;p=thirdparty%2Flibtool.git * tests/cdemo/Makefile.am: Remove broken use of undocumented Automake variable `$(OBJECTS)'. * tests/demo/Makefile.am, tests/depdemo/Makefile.am: Likewise. * tests/f77demo/Makefile.am, tests/fcdemo/Makefile.am: Likewise. * tests/mdemo/Makefile.am, tests/mdemo2/Makefile.am: Likewise. * tests/pdemo/Makefile.am, tests/tagdemo/Makefile.am: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 5834c0bca..370dc0905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-02-03 Ralf Wildenhues + * tests/cdemo/Makefile.am: Remove broken use of undocumented + Automake variable `$(OBJECTS)'. + * tests/demo/Makefile.am, tests/depdemo/Makefile.am: Likewise. + * tests/f77demo/Makefile.am, tests/fcdemo/Makefile.am: Likewise. + * tests/mdemo/Makefile.am, tests/mdemo2/Makefile.am: Likewise. + * tests/pdemo/Makefile.am, tests/tagdemo/Makefile.am: Likewise. + * libltdl/config/ltmain.m4sh (func_mode_link): Fix logic for adding run paths to also add paths for installed libtool libraries in case `-static' is used. diff --git a/tests/cdemo/Makefile.am b/tests/cdemo/Makefile.am index 98cdf92f7..ccc76ffc0 100644 --- a/tests/cdemo/Makefile.am +++ b/tests/cdemo/Makefile.am @@ -34,6 +34,5 @@ bin_PROGRAMS = cdemo cdemo_SOURCES = main.c cdemo_LDADD = libfoo.la -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am index ae0f065a3..481fc776e 100644 --- a/tests/demo/Makefile.am +++ b/tests/demo/Makefile.am @@ -64,7 +64,6 @@ helldl helldl$(EXEEXT): chmod +x $@ endif -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/depdemo/Makefile.am b/tests/depdemo/Makefile.am index 61be17d58..6ea26afe6 100644 --- a/tests/depdemo/Makefile.am +++ b/tests/depdemo/Makefile.am @@ -38,6 +38,5 @@ depdemo_static_LDADD = $(depdemo_LDADD) depdemo_static_DEPENDENCIES = $(depdemo_DEPENDENCIES) depdemo_static_LDFLAGS = $(STATIC) -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/f77demo/Makefile.am b/tests/f77demo/Makefile.am index 3c9f71f9f..b412bfcb2 100644 --- a/tests/f77demo/Makefile.am +++ b/tests/f77demo/Makefile.am @@ -46,6 +46,5 @@ fprogram_LDADD = libfoo.la libfoo3.la cprogram_SOURCES = cprogram.c cprogram_LDADD = libmix.la $(FLIBS) -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/fcdemo/Makefile.am b/tests/fcdemo/Makefile.am index 661d53373..417aa7963 100644 --- a/tests/fcdemo/Makefile.am +++ b/tests/fcdemo/Makefile.am @@ -46,7 +46,6 @@ fprogram_LDADD = libfoo.la libfoo3.la cprogram_SOURCES = cprogram.c cprogram_LDADD = libmix.la $(FCLIBS) -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/mdemo/Makefile.am b/tests/mdemo/Makefile.am index 46373f6df..848341003 100644 --- a/tests/mdemo/Makefile.am +++ b/tests/mdemo/Makefile.am @@ -68,6 +68,5 @@ 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/tests/mdemo2/Makefile.am b/tests/mdemo2/Makefile.am index 206d7e1a6..a9d7d1943 100644 --- a/tests/mdemo2/Makefile.am +++ b/tests/mdemo2/Makefile.am @@ -34,6 +34,5 @@ mdemo2_static_LDFLAGS = $(STATIC) $(mdemo2_LDFLAGS) mdemo2_static_LDADD = $(mdemo2_LDADD) mdemo2_static_DEPENDENCIES = $(mdemo2_DEPENDENCIES) -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/pdemo/Makefile.am b/tests/pdemo/Makefile.am index 0bb63acdb..8156d98cb 100644 --- a/tests/pdemo/Makefile.am +++ b/tests/pdemo/Makefile.am @@ -64,7 +64,6 @@ helldl helldl$(EXEEXT): chmod +x $@ endif -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tests/tagdemo/Makefile.am b/tests/tagdemo/Makefile.am index cf2dff100..18eb0def1 100644 --- a/tests/tagdemo/Makefile.am +++ b/tests/tagdemo/Makefile.am @@ -44,6 +44,5 @@ bin_PROGRAMS = tagdemo tagdemo_SOURCES = main.cpp tagdemo_LDADD = libbaz.la -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck