From 97b6e19e2f61b6ce42218c0c66071762193c968c Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 15 Oct 2003 11:01:12 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ tests/Makefile.am | 2 +- tests/demo/Makefile.am | 3 ++- tests/pdemo/Makefile.am | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6e82132c..85c63c666 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2003-10-15 Gary V. Vaughan + * 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 7f867562d..64d70eb9d 100644 --- 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 e044ee913..007129e36 100644 --- 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 557060293..b68c61cf0 100644 --- 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 -- 2.47.2