Hi Gary,

* Gary V. Vaughan wrote on Thu, Jan 05, 2006 at 05:18:04PM CET:
> Ralf Wildenhues wrote:
> >OK to remove all these, like below, but for all of
> >tests/*demo*/Makefile.am?  OK for branch-1-5 as well?
> 
> Sure.  Looks good to me.

Thanks!  Sorry for the delay.

> >        * tests/demo/Makefile.am: Remove broken use of undocumented
> >        Automake variable `$(OBJECTS)'.

Applied these patches to HEAD and branch-1-5, respectively.

Cheers,
Ralf
        * 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.

Index: tests/cdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- tests/cdemo/Makefile.am     23 Aug 2005 01:49:37 -0000      1.7
+++ tests/cdemo/Makefile.am     3 Feb 2006 09:34:03 -0000
@@ -34,6 +34,5 @@
 cdemo_SOURCES = main.c
 cdemo_LDADD = libfoo.la
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: tests/demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- tests/demo/Makefile.am      23 Aug 2005 01:49:37 -0000      1.8
+++ tests/demo/Makefile.am      3 Feb 2006 09:34:03 -0000
@@ -64,7 +64,6 @@
        chmod +x $@
 endif
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
Index: tests/depdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- tests/depdemo/Makefile.am   23 Aug 2005 01:49:37 -0000      1.7
+++ tests/depdemo/Makefile.am   3 Feb 2006 09:34:03 -0000
@@ -38,6 +38,5 @@
 depdemo_static_DEPENDENCIES = $(depdemo_DEPENDENCIES)
 depdemo_static_LDFLAGS = $(STATIC)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: tests/f77demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/f77demo/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- tests/f77demo/Makefile.am   23 Aug 2005 01:49:37 -0000      1.8
+++ tests/f77demo/Makefile.am   3 Feb 2006 09:34:03 -0000
@@ -46,6 +46,5 @@
 cprogram_SOURCES = cprogram.c
 cprogram_LDADD = libmix.la $(FLIBS)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: tests/fcdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/fcdemo/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- tests/fcdemo/Makefile.am    24 Aug 2005 11:11:39 -0000      1.3
+++ tests/fcdemo/Makefile.am    3 Feb 2006 09:34:03 -0000
@@ -46,7 +46,6 @@
 cprogram_SOURCES = cprogram.c
 cprogram_LDADD = libmix.la $(FCLIBS)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
Index: tests/mdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- tests/mdemo/Makefile.am     23 Aug 2005 01:49:37 -0000      1.7
+++ tests/mdemo/Makefile.am     3 Feb 2006 09:34:03 -0000
@@ -68,6 +68,5 @@
 mdemo_static_LDADD = $(mdemo_LDADD)
 mdemo_static_DEPENDENCIES = $(mdemo_DEPENDENCIES)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: tests/mdemo2/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- tests/mdemo2/Makefile.am    23 Aug 2005 01:49:37 -0000      1.8
+++ tests/mdemo2/Makefile.am    3 Feb 2006 09:34:03 -0000
@@ -34,6 +34,5 @@
 mdemo2_static_LDADD = $(mdemo2_LDADD)
 mdemo2_static_DEPENDENCIES = $(mdemo2_DEPENDENCIES)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: tests/pdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- tests/pdemo/Makefile.am     23 Aug 2005 01:49:37 -0000      1.8
+++ tests/pdemo/Makefile.am     3 Feb 2006 09:34:03 -0000
@@ -64,7 +64,6 @@
        chmod +x $@
 endif
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
Index: tests/tagdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- tests/tagdemo/Makefile.am   23 Aug 2005 01:49:37 -0000      1.8
+++ tests/tagdemo/Makefile.am   3 Feb 2006 09:34:03 -0000
@@ -44,6 +44,5 @@
 tagdemo_SOURCES = main.cpp
 tagdemo_LDADD = libbaz.la
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
        * 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.

Index: cdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/cdemo/Attic/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- cdemo/Makefile.am   1 Jun 2002 14:09:50 -0000       1.7
+++ cdemo/Makefile.am   3 Feb 2006 09:31:24 -0000
@@ -17,6 +17,5 @@
 cdemo_SOURCES = main.c
 cdemo_LDADD = libfoo.la
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/demo/Attic/Makefile.am,v
retrieving revision 1.29.2.2
diff -u -r1.29.2.2 Makefile.am
--- demo/Makefile.am    19 Sep 2004 12:04:52 -0000      1.29.2.2
+++ demo/Makefile.am    3 Feb 2006 09:31:24 -0000
@@ -48,7 +48,6 @@
        chmod +x $@
 endif
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
Index: depdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/depdemo/Attic/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- depdemo/Makefile.am 3 Mar 2002 03:19:55 -0000       1.10
+++ depdemo/Makefile.am 3 Feb 2006 09:31:24 -0000
@@ -19,6 +19,5 @@
 depdemo_static_DEPENDENCIES = $(depdemo_DEPENDENCIES)
 depdemo_static_LDFLAGS = $(STATIC)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: f77demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/f77demo/Attic/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- f77demo/Makefile.am 31 Oct 2002 00:52:39 -0000      1.2
+++ f77demo/Makefile.am 3 Feb 2006 09:31:25 -0000
@@ -24,7 +24,6 @@
 cprogram_SOURCES = cprogram.c
 cprogram_LDADD = libmix.la
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
Index: mdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/mdemo/Attic/Makefile.am,v
retrieving revision 1.46.2.1
diff -u -r1.46.2.1 Makefile.am
--- mdemo/Makefile.am   31 Jul 2003 20:46:41 -0000      1.46.2.1
+++ mdemo/Makefile.am   3 Feb 2006 09:31:25 -0000
@@ -51,6 +51,5 @@
 mdemo_static_LDADD = $(mdemo_LDADD)
 mdemo_static_DEPENDENCIES = $(mdemo_DEPENDENCIES)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: mdemo2/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/mdemo2/Attic/Makefile.am,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 Makefile.am
--- mdemo2/Makefile.am  26 Sep 2003 12:51:23 -0000      1.1.2.3
+++ mdemo2/Makefile.am  3 Feb 2006 09:31:25 -0000
@@ -19,6 +19,5 @@
 mdemo2_static_LDADD = $(mdemo2_LDADD)
 mdemo2_static_DEPENDENCIES = $(mdemo2_DEPENDENCIES)
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
Index: pdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/pdemo/Attic/Makefile.am,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 Makefile.am
--- pdemo/Makefile.am   19 Sep 2004 12:04:52 -0000      1.6.2.2
+++ pdemo/Makefile.am   3 Feb 2006 09:31:25 -0000
@@ -48,7 +48,6 @@
        chmod +x $@
 endif
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
Index: tagdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tagdemo/Attic/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- tagdemo/Makefile.am 1 Jun 2002 14:09:50 -0000       1.4
+++ tagdemo/Makefile.am 3 Feb 2006 09:31:25 -0000
@@ -25,6 +25,5 @@
 tagdemo_SOURCES = main.cpp
 tagdemo_LDADD = libbaz.la
 
-$(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck

Reply via email to