From 5f872523af8c0e7a4c52e3a474bd8517c384bd8b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 24 Sep 1997 22:11:38 +0000 Subject: [PATCH] dependencies fix --- ChangeLog | 5 +++++ automake.in | 4 ++++ automake.texi | 4 ++-- stamp-vti | 2 +- tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/depend3.test | 36 ++++++++++++++++++++++++++++++++++++ version.texi | 2 +- 9 files changed, 55 insertions(+), 6 deletions(-) create mode 100755 tests/depend3.test diff --git a/ChangeLog b/ChangeLog index 42288d53..cf601f62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 24 16:10:37 1997 Tom Tromey + + * automake.in (handle_programs): Define _DEPENDENCIES variable if + not defined by user. + Thu Sep 18 19:43:38 1997 Tom Tromey * m4/sanity.m4: Quote "$@" for m4. From Gord Matzigkeit. diff --git a/automake.in b/automake.in index 5d88238e..0a86dc17 100755 --- 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 a6767730..0b5f256d 100644 --- 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 ced07bd5..797b30e7 100644 --- 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 a7805f30..5580caeb 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 24 16:01:59 1997 Tom Tromey + + * depend3.test: New file. + Mon Aug 25 17:24:42 1997 Tom Tromey * cygwin32.test: Use AM_EXEEXT, not AM_CYGWIN32. diff --git a/tests/Makefile.am b/tests/Makefile.am index e9cd928b..100ea1df 100644 --- 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 dbeac40f..0e08fc4c 100644 --- 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 index 00000000..53ed9fc2 --- /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 ced07bd5..797b30e7 100644 --- 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 -- 2.43.5