From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 4 Sep 2000 08:20:02 +0000 (+0000)
Subject: * tests/dryrun.test: Build libsub.la along with the object files,
X-Git-Tag: release-1-3d~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=916ce7a3725c243291c18c3d6c2fe1fdcec9cb21;p=thirdparty%2Flibtool.git

* 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 65ca5e40d..b2f619bff 100644
--- 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 c4259fa3a..c1830fd71 100755
--- 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