dependencies fix

diff --git a/ChangeLog b/ChangeLog
index 42288d53569109e30eb7d7b9373214adb44c8303..cf601f62126059b04d8b683e1d69680cc8f69514 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 24 16:10:37 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_programs): Define _DEPENDENCIES variable if
+       not defined by user.
+
 Thu Sep 18 19:43:38 1997  Tom Tromey  <tromey@cygnus.com>
 
        * m4/sanity.m4: Quote "$@" for m4.  From Gord Matzigkeit.

diff --git a/automake.in b/automake.in
index 5d88238e3ba957e9122f9a7d65e7f97a950ec770..0a86dc17e7eceb31dafcf15b2fe0d51cbec3323b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1502,6 +1502,10 @@ sub handle_programs
                }
                $lex_file_seen = 0;
            }
+           elsif (! &variable_defined ($xname . '_DEPENDENCIES'))
+           {
+               &define_variable ($xname . '_DEPENDENCIES', '');
+           }
            $xt = '_SOURCES'
        }
 

diff --git a/automake.texi b/automake.texi
index a676773051ca458832da80cac701ca95d019b950..0b5f256d49e5763f52cbfda839f2b703da6baf00 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1665,7 +1665,7 @@ uses @samp{AM_WITH_REGEX}, then any dependency on @file{rx.h} or
 @file{regex.h} should be removed, because the correct one cannot be
 known until the user configures the package.
 
-As it turns out, @code{automake} is actually smart enough to the
+As it turns out, @code{automake} is actually smart enough to handle the
 particular case of the regular expression header.  It will also
 automatically omit @file{libintl.h} if @samp{AM_GNU_GETTEXT} is used.
 
@@ -1679,7 +1679,7 @@ turn on the dependency-tracking code again, simply re-run
 @code{automake}.
 
 The actual dependency files are put under the build directory, in a
-subdirectory named @file{.deps}.  These depencencies are machine
+subdirectory named @file{.deps}.  These dependencies are machine
 specific.  It is safe to delete them if you like; they will be
 automatically recreated during the next build.
 

diff --git a/stamp-vti b/stamp-vti
index ced07bd532686bad3115438ae30e42f84685bef1..797b30e73690ab79844489ea481f49a0bcf99002 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 6 August 1997
+@set UPDATED 24 September 1997
 @set EDITION 1.2a
 @set VERSION 1.2a

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a7805f30b821778658e4d853cbdf497c90cf092a..5580caeb3c719797784fef47f279bceeb8a1a80c 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 24 16:01:59 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * depend3.test: New file.
+
 Mon Aug 25 17:24:42 1997  Tom Tromey  <tromey@cygnus.com>
 
        * cygwin32.test: Use AM_EXEEXT, not AM_CYGWIN32.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e9cd928b2154c779f65dcd96f96e9c8ceddef73b..100ea1dfc7a529a29294dadf0fde386faacf3222 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test        \
 cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
 ldadd.test version2.test conf2.test cond.test cond2.test xsource.test \
-libobj6.test
+libobj6.test depend3.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index dbeac40fcb8e14c3650643fd3c976c776b233a42..0e08fc4c8739a7d0b3f6b89303e26c81ce8678ed 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -87,7 +87,7 @@ remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test        \
 cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
 ldadd.test version2.test conf2.test cond.test cond2.test xsource.test \
-libobj6.test
+libobj6.test depend3.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/depend3.test b/tests/depend3.test
new file mode 100755 (executable)
index 0000000..53ed9fc
--- /dev/null
+++ b/tests/depend3.test
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+# Test _DEPENDENCIES variable.  From Lee Iverson.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AM_PROG_INSTALL
+AC_PROG_CC
+AC_SUBST(DEPS)
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = TerraVision
+
+TerraVision_SOURCES = \
+       AboutDialog.c Clock.c Dialogs.c DrawModel.c \
+       TsmWidget.c Gats.c GATSDialogs.c Model.c ModelAnim.c \
+       ScannedMap.c \
+        TerraVision.c TerraVisionAvs.c TerraVisionCAVE.c \
+       Texture.c ThreeDControl.c ThreeDPanel.c \
+       ThreeDWidget.c ThreeDWidget1.c TileManager.c \
+       TileRequester.c TwoDWidget.c \
+        Visible.c RequestGenerator.c X11FrameGrab.c \
+       matrix.c pixmaps.c xpmhash.c xpmread.c xcolor.c xv24to8.c
+
+DEPS = @DEPS@
+
+TerraVision_DEPENDENCIES = $(DEPS)
+END
+
+$AUTOMAKE

diff --git a/version.texi b/version.texi
index ced07bd532686bad3115438ae30e42f84685bef1..797b30e73690ab79844489ea481f49a0bcf99002 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 6 August 1997
+@set UPDATED 24 September 1997
 @set EDITION 1.2a
 @set VERSION 1.2a