* demo/Makefile.am (libhell0_a_SOURCES): Do not name sources

already built with libtool...
(libhell0_a_LIBADD): ...instead name the objects directly.  This
prevents a long standing warning from automake 1.7+.
* pdemo/Makefile.am (libhell0_a_SOURCES, libhell0_a_LIBADD):
Ditto.

diff --git a/ChangeLog b/ChangeLog
index c6e82132c0df1764ccb3f63fc867fa574102fcb7..85c63c666c7679fc76b86f9a0922532b9b629d63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-10-15  Gary V. Vaughan  <gary@gnu.org>
 
+       * demo/Makefile.am (libhell0_a_SOURCES): Do not name sources
+       already built with libtool...
+       (libhell0_a_LIBADD): ...instead name the objects directly.  This
+       prevents a long standing warning from automake 1.7+.
+       * pdemo/Makefile.am (libhell0_a_SOURCES, libhell0_a_LIBADD):
+       Ditto.
+
        * bootstrap: Make the fake files valid shell scripts with a
        comment incase they get left around.
        (LIBTOOLIZE): Use a dummy script to prevent the installed

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7f867562daac7b33ac379430230231bf2168b269..64d70eb9db35239053f8177536d068faa1ab1a8e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,7 @@ COMMON_TESTS = \
        mdemo-inst.test mdemo-unst.test mdemo-dryrun.test \
        mdemo2-conf.test mdemo2-make.test mdemo2-exec.test \
        pdemo-conf.test pdemo-make.test pdemo-exec.test \
-       pdemo-inst.test pdemo-unst.test \
+       pdemo-inst.test \
        demo-nofast.test demo-make.test demo-exec.test \
        demo-inst.test demo-unst.test \
        depdemo-nofast.test depdemo-make.test depdemo-exec.test \

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index e044ee913a66fd21301840946303e23b4dcc816a..007129e36a02ab614fe5206bd7853666269962ca 100644 (file)
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -138,7 +138,8 @@ hc-minusL: $(hell_OBJECTS) $(hell_DEPENDENCIES)
 # This is one of the essential tests for deplibs_check_method=pass_all.
 # If this one passes with pass_all, it is likely that pass_all works
 EXTRA_LIBRARIES = libhell0.a
-libhell0_a_SOURCES = hello.c foo.c
+libhell0_a_SOURCES =
+libhell0_a_LIBADD = hello.$(OBJEXT) foo.$(OBJEXT)
 EXTRA_LTLIBRARIES = libhell1.la libhell2.la
 libhell1_la_SOURCES = hell1.c
 libhell1_la_LIBADD = -L. -lhell0

diff --git a/tests/pdemo/Makefile.am b/tests/pdemo/Makefile.am
index 5570602938154cc15ee7966b596ca775b971206f..b68c61cf033c6737ca708f04fe7c868b5db2f3ff 100644 (file)
--- a/tests/pdemo/Makefile.am
+++ b/tests/pdemo/Makefile.am
@@ -132,7 +132,7 @@ hc-minusL: $(hell_OBJECTS) $(hell_DEPENDENCIES)
 # If this one passes with pass_all, it is likely that pass_all works
 EXTRA_LIBRARIES = libhell0.a
 libhell0_a_SOURCES =
-libhell0_a_LIBADD = longer_file_name_hello.o longer_file_name_foo.o
+libhell0_a_LIBADD = longer_file_name_hello.$(OBJEXT) longer_file_name_foo.$(OBJEXT)
 EXTRA_LTLIBRARIES = libhell1.la libhell2.la
 libhell1_la_SOURCES = longer_file_name_hell1.c
 libhell1_la_LIBADD = -L. -lhell0