* tests/dryrun.test: Build libsub.la along with the object files,

since it is needed by libfoo2.la.

diff --git a/ChangeLog b/ChangeLog
index 65ca5e40dc318462306a9bb0944f017f5f3f5b4a..b2f619bfff720b2a96de54f6b0f1470eaf4c2d59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-04  Alexandre Oliva  <aoliva@redhat.com>
 
+       * tests/dryrun.test: Build libsub.la along with the object files,
+       since it is needed by libfoo2.la.
+
        * mdemo/Makefile.am: Mark only libfoo2 as -no-undefined.
        Explicitly link it with libsub.la.
 

diff --git a/tests/dryrun.test b/tests/dryrun.test
index c4259fa3a6690221c0c10a4c21677964e1a09fc4..c1830fd715a46660820fa6a3e187229eb25a9464 100755 (executable)
--- a/tests/dryrun.test
+++ b/tests/dryrun.test
@@ -42,26 +42,27 @@ mv libtool $objdir/libtool
 mv $objdir/libtool.new libtool
 
 # main.o is not compiled with libtool, but it depends on it, so make
-# sure it is up-to-date
+# sure it is up-to-date.  libfoo2.la is linked with libsub.la, so make
+# sure it exists, otherwise libtool will complain.
 $make main.$OBJEXT || exit 1
 
 echo "= Making object files in ../mdemo (dry run)"
 ls -l . $objdir > $before
-force_dry_run=yes $make foo1.lo foo2.lo || exit $?
+force_dry_run=yes $make foo1.lo foo2.lo sub.lo || exit $?
 ls -l . $objdir > $after
 cmp $before $after > /dev/null || exit 1
 # Now really make them
 echo "= Making object files in ../mdemo"
-$make foo1.lo foo2.lo || exit 1
+$make foo1.lo foo2.lo libsub.la || exit 1
 
 echo "= Making libraries in ../mdemo (dry run)"
 ls -l . $objdir > $before
-force_dry_run=yes $make foo1.la libfoo2.la libsub.la || exit $?
+force_dry_run=yes $make foo1.la libfoo2.la || exit $?
 ls -l . $objdir > $after
 cmp $before $after > /dev/null || exit 1
 # Now really make them
 echo "= Making libraries in ../mdemo"
-$make foo1.la libfoo2.la libsub.la || exit 1
+$make foo1.la libfoo2.la || exit 1
 
 echo "= Making programs in ../mdemo (dry run)"
 ls -l . $objdir > $before