From 675f22a0c81d9e5a8dae7cbe7d696c7896c44d67 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 3 Feb 2006 09:37:34 +0000 Subject: [PATCH] * cdemo/Makefile.am: Remove broken use of undocumented Automake variable `$(OBJECTS)'. * demo/Makefile.am, depdemo/Makefile.am: Likewise. * f77demo/Makefile.am, mdemo/Makefile.am: Likewise. * mdemo2/Makefile.am, pdemo/Makefile.am: Likewise. * tagdemo/Makefile.am: Likewise. --- ChangeLog | 7 +++++++ cdemo/Makefile.am | 1 - demo/Makefile.am | 1 - depdemo/Makefile.am | 1 - f77demo/Makefile.am | 1 - mdemo/Makefile.am | 1 - mdemo2/Makefile.am | 1 - pdemo/Makefile.am | 1 - tagdemo/Makefile.am | 1 - 9 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54db631e3..a41492b87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-02-03 Ralf Wildenhues + * cdemo/Makefile.am: Remove broken use of undocumented + Automake variable `$(OBJECTS)'. + * demo/Makefile.am, depdemo/Makefile.am: Likewise. + * f77demo/Makefile.am, mdemo/Makefile.am: Likewise. + * mdemo2/Makefile.am, pdemo/Makefile.am: Likewise. + * tagdemo/Makefile.am: Likewise. + * ltmain.in (link mode): Fix logic for adding run paths to also add paths for installed libtool libraries in case `-static' is used. diff --git a/cdemo/Makefile.am b/cdemo/Makefile.am index 62c930f87..b32335d4a 100644 --- a/cdemo/Makefile.am +++ b/cdemo/Makefile.am @@ -17,6 +17,5 @@ bin_PROGRAMS = cdemo cdemo_SOURCES = main.c cdemo_LDADD = libfoo.la -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/demo/Makefile.am b/demo/Makefile.am index 78b52b637..6cbebb771 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -48,7 +48,6 @@ helldl helldl$(EXEEXT): chmod +x $@ endif -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/depdemo/Makefile.am b/depdemo/Makefile.am index 2108b7faf..7bffe3a93 100644 --- a/depdemo/Makefile.am +++ b/depdemo/Makefile.am @@ -19,6 +19,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/f77demo/Makefile.am b/f77demo/Makefile.am index 702a35268..6d52ba3c8 100644 --- a/f77demo/Makefile.am +++ b/f77demo/Makefile.am @@ -24,7 +24,6 @@ fprogram_LDADD = libfoo.la cprogram_SOURCES = cprogram.c cprogram_LDADD = libmix.la -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am index 8136c4351..1904f35a6 100644 --- a/mdemo/Makefile.am +++ b/mdemo/Makefile.am @@ -51,6 +51,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/mdemo2/Makefile.am b/mdemo2/Makefile.am index a1a548805..e44f21991 100644 --- a/mdemo2/Makefile.am +++ b/mdemo2/Makefile.am @@ -19,6 +19,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/pdemo/Makefile.am b/pdemo/Makefile.am index c3abee5be..c63a47975 100644 --- a/pdemo/Makefile.am +++ b/pdemo/Makefile.am @@ -48,7 +48,6 @@ helldl helldl$(EXEEXT): chmod +x $@ endif -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/tagdemo/Makefile.am b/tagdemo/Makefile.am index db5ae4aa5..be1ffdd3b 100644 --- a/tagdemo/Makefile.am +++ b/tagdemo/Makefile.am @@ -25,6 +25,5 @@ bin_PROGRAMS = tagdemo tagdemo_SOURCES = main.cpp tagdemo_LDADD = libbaz.la -$(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck -- 2.47.3