CONFIG_STATUS_DEPENDENCIES addition from Ian

diff --git a/ChangeLog b/ChangeLog
index 3878329..550270f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jul 16 18:09:03 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+       * remake.am (config.status): Depend upon
+       $(CONFIG_STATUS_DEPENDENCIES).
+       * automake.in (handle_configure): Examine
+       CONFIG_STATUS_DEPENDENCIES.
+
+Tue Jul 14 13:37:48 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.am: Always look in srcdir for automake.in.
+
 Tue Jun 23 14:00:27 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * progs.am: Don't let $(EXEEXT) interfere with $(transform).

diff --git a/Makefile.am b/Makefile.am
index e9ac5bf..7e1e05d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,9 @@ maintainer-check: automake aclocal
 ## This check avoids accidental configure substitutions in the source.
 ## There are exactly 8 lines that should be modified.  This works out
 ## to 24 lines of diffs.
-       @if test `diff automake.in automake | wc -l` -ne 24; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
-         diff -c automake.in automake; \
+         diff -c $(srcdir)/automake.in automake; \
          exit 1; \
        fi
 ## Syntax check with default Perl (on my machine, Perl 5).

diff --git a/Makefile.in b/Makefile.in
index f6ec9d2..16c3492 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
+DISTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -484,14 +484,19 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-tags \
                mostlyclean-generic
 
@@ -550,9 +555,9 @@ perl4-check: automake aclocal
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
-       @if test `diff automake.in automake | wc -l` -ne 24; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
-         diff -c automake.in automake; \
+         diff -c $(srcdir)/automake.in automake; \
          exit 1; \
        fi
        $(PERL) -c -w automake

diff --git a/TODO b/TODO
index 9c5142d..c43c241 100644 (file)
--- a/TODO
+++ b/TODO
@@ -14,6 +14,11 @@
   ANSWER: for each dependency foo.h, make a dummy target `foo.h:'
   in the .P file.  Then the right thing ought to happen
 
+* If you suppress an internal variable by specifying a variable
+  in a Makefile.am, but the variable is conditional, then automake
+  should generate the internal variable conditionally.
+  You have to scan the map of all conditions and fill in the holes here
+
 * Every program foo has FOOFLAGS right now.
   It should also have AM_FOOFLAGS, which can be set in Makefile.am.
 DONE: but needs to be documented

diff --git a/automake.in b/automake.in
index 73fcb5c..84c1602 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3068,6 +3068,7 @@ sub handle_configure
     {
        &handle_aclocal_m4;
        $output_rules .= &file_contents ('remake');
+       &examine_variable ('CONFIG_STATUS_DEPENDENCIES');
        &examine_variable ('CONFIGURE_DEPENDENCIES');
        $top_reldir = '';
     }

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index e9ac5bf..7e1e05d 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -53,9 +53,9 @@ maintainer-check: automake aclocal
 ## This check avoids accidental configure substitutions in the source.
 ## There are exactly 8 lines that should be modified.  This works out
 ## to 24 lines of diffs.
-       @if test `diff automake.in automake | wc -l` -ne 24; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
-         diff -c automake.in automake; \
+         diff -c $(srcdir)/automake.in automake; \
          exit 1; \
        fi
 ## Syntax check with default Perl (on my machine, Perl 5).

diff --git a/remake.am b/remake.am
index 4c640f5..486c3ce 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 
 ## Explicitly look in srcdir for benefit of non-GNU makes.
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 ## Explicitly look in srcdir for benefit of non-GNU makes.
 $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)

diff --git a/stamp-vti b/stamp-vti
index 302b1cb..0cc49d7 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 3 April 1998
+@set UPDATED 23 June 1998
 @set EDITION 1.3
 @set VERSION 1.3

diff --git a/version.texi b/version.texi
index 302b1cb..0cc49d7 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 3 April 1998
+@set UPDATED 23 June 1998
 @set EDITION 1.3
 @set VERSION 1.3