From cb231b8529777a6fb858a5ec660cf9159f5efce4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 1 Jun 2001 15:22:27 +0000 Subject: [PATCH] * tests/Makefile.am (XFAIL_TESTS): Added ltdeps.test. (TESTS): Likewise. * tests/ltdeps.test: New file. Report from Lars J. Aas. --- ChangeLog | 6 ++++++ tests/Makefile.am | 3 ++- tests/Makefile.in | 3 ++- tests/ltdeps.test | 45 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100755 tests/ltdeps.test diff --git a/ChangeLog b/ChangeLog index 203764ed..c34cdbc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-06-01 Tom Tromey + + * tests/Makefile.am (XFAIL_TESTS): Added ltdeps.test. + (TESTS): Likewise. + * tests/ltdeps.test: New file. Report from Lars J. Aas. + 2001-05-31 Tom Tromey * automake.texi (Alternative): New node. diff --git a/tests/Makefile.am b/tests/Makefile.am index cfed0b3b..dc6e2744 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test +XFAIL_TESTS = subdir5.test ltdeps.test TESTS = \ acinclude.test \ @@ -175,6 +175,7 @@ link_f_c_cxx.test \ link_f_cxx.test \ link_f_only.test \ lisp.test \ +ltdeps.test \ ltlibobjs.test \ make.test \ makevars.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 0b28d75c..3fe9bd27 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -68,7 +68,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test +XFAIL_TESTS = subdir5.test ltdeps.test TESTS = \ acinclude.test \ @@ -241,6 +241,7 @@ link_f_c_cxx.test \ link_f_cxx.test \ link_f_only.test \ lisp.test \ +ltdeps.test \ ltlibobjs.test \ make.test \ makevars.test \ diff --git a/tests/ltdeps.test b/tests/ltdeps.test new file mode 100755 index 00000000..1a2ea93c --- /dev/null +++ b/tests/ltdeps.test @@ -0,0 +1,45 @@ +#! /bin/sh + +# Test to make sure libtool library dependencies are correct. +# Report from Lars J. Aas. + +. $srcdir/defs || exit 1 + +cat >> configure.in << 'END' +AC_PROG_LIBTOOL +AC_PROG_CXX +AM_CONDITIONAL(HACKING_COMPACT_BUILD, whatever) +END + +cat > Makefile.am << 'END' +RegularSources = \ + SbBSPTree.cpp \ + SbBox2f.cpp \ + SbBox2s.cpp + +LinkHackSources = \ + all.cpp + +if HACKING_COMPACT_BUILD +BuildSources = $(LinkHackSources) +else +BuildSources = $(RegularSources) +endif + +noinst_LTLIBRARIES = libbase.la +libbase_la_SOURCES = $(BuildSources) + +EXTRA_libbase_la_SOURCES = \ + $(RegularSources) $(LinkHackSources) +END + +: > ltconfig +: > ltmain.sh +: > config.guess +: > config.sub + +$ACLOCAL || exit 1 +$AUTOMAKE || exit 1 + +grep 'OBJECTS =$' Makefile.in && exit 1 +exit 0 -- 2.43.5