More error checking

diff --git a/ChangeLog b/ChangeLog
index 8ba0c53ddf6f4fbc3b5abe953ae824c40e24ba30..75f777a9312ec0708e7d186a306123c0844f87ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Thu Sep  5 09:06:23 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (usage): Include bug-reporting information.
+       (handle_lib_objects): Error if LIBOBJS seen but never set.
 
        * aclocal.in ($acdir): Use @datadir@/aclocal.
        (usage): Include bug-reporting information.

diff --git a/TODO b/TODO
index fe12ec4b0ccaaf0b044d492e7dc5b96fc7e52a58..39811c7a33b47db5a85c297df65b5682af45b9ce 100644 (file)
--- a/TODO
+++ b/TODO
@@ -351,6 +351,9 @@ document variable scanning: $() and ${} interpolation
 
 document --build-dir
 
+document the fact that you can re-run automake (s/ args) to get back
+into a "maintainer" mode (auto-dependencies)
+
 ================================================================
 
 Libraries:

diff --git a/automake.in b/automake.in
index 29ad2f5148fa9aacbe0040d4614b4ddf7d0d6e58..931abc9a02cb8b7b43d4784fd6987583eaefda03 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -890,6 +890,11 @@ sub handle_lib_objects
        # means adding entries to dep_files.
        if ($lsearch eq '@LIBOBJS@')
        {
+           if (! keys %libsources)
+           {
+               &am_line_error ($var, "\@LIBOBJS\@ seen but never set in \`configure.in'");
+           }
+
            local ($iter, $rewrite);
            foreach $iter (keys %libsources)
            {

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6b8945899bb1441107bc7661f391ba8377cc5476..93f3cd0ad8b0fb289529b92be6f2c9653babe16f 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep  5 22:54:26 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * libobj3.test: New file.
+
 Tue Sep  3 20:57:38 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * block.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89201fa91019244ee4e03507d97e61b7059b8c68..5d78e9e51df69278a65fef2637dbf297392f9b18 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,6 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
 man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
-order.test libobj2.test interp.test alllib.test block.test
+order.test libobj2.test interp.test alllib.test block.test libobj3.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 23adbd705e38560159b37757440edc52ac2ff68f..9e0842cf4e201fc7261ae7353ed91f289d406da5 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -51,7 +51,7 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
 man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
-order.test libobj2.test interp.test alllib.test block.test
+order.test libobj2.test interp.test alllib.test block.test libobj3.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/libobj3.test b/tests/libobj3.test
new file mode 100755 (executable)
index 0000000..1220e77
--- /dev/null
+++ b/tests/libobj3.test
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# Test to make sure LIBOBJS actually set in configure.in if seen.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = tu
+tu_SOURCES =
+tu_LIBADD = @LIBOBJS@
+END
+
+$AUTOMAKE && exit 1
+exit 0