Quick changes for make 3.76.1.3.76.1

8 files changed, 31 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ad6b92..f773f3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Sep 19 09:20:49 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* Makefile.am: Add loadavg files to clean rules.
+
+	* configure.in (AC_OUTPUT): Remove stamp-config; no longer needed.
+	* Makefile.ami (distclean): Ditto.
+	* SMakefile (distclean): Ditto.
+
+	* main.c (main): Arg count should be int, not char!  Major braino.
+
 Tue Sep 16 10:18:22 1997  Paul D. Smith  <psmith@baynetworks.com>
 
 	* Version 3.76 released.
diff --git a/Makefile.am b/Makefile.am
index 58bdc95..5463428 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,9 @@ EXTRA_DIST = 	make.man $(BUILT_SOURCES) remote-cstms.c\
 
 SUBDIRS =	glob
 
+MOSTLYCLEANFILES = loadavg.c
+CLEANFILES =	loadavg
+
 # --------------- Local DIST Section
 
 # Install the w32 subdirectory
@@ -66,7 +69,7 @@ check-loadavg: loadavg
 # specified, or else in the srcdir or the distdir, their parents, and _their_
 # parents.
 #
-check-regression:
+check-regression: all
 	here=`pwd`; testdir=""; \
 	  case "$(MAKE_TEST)" in "") \
 	    for d1 in $$here $(srcdir); do \
diff --git a/Makefile.ami b/Makefile.ami
index e24da74..94845ec 100644
--- a/Makefile.ami
+++ b/Makefile.ami
@@ -245,7 +245,7 @@ clean: glob-clean
 	-$(RM) make loadavg "#?.o" core make.dvi
 
 distclean: clean glob-realclean
-	-$(RM) Makefile config.h config.status build.sh stamp-config
+	-$(RM) Makefile config.h config.status build.sh
 	-$(RM) config.log config.cache
 	-$(RM) TAGS tags
 	-$(RM) make.?? make.??s make.log make.toc make.*aux
diff --git a/NEWS b/NEWS
index 2943b7b..70cdc62 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
 GNU make NEWS                                               -*-indented-text-*-
   History of user-visible changes.
-  18 Aug 1997
+  19 Sep 1997
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU make bug reports to bug-gnu-utils@prep.ai.mit.edu.
 
+Version 3.76.1
+
+* Small (but serious) bug fix.  Quick rollout to get into the GNU source CD.
+
 Version 3.76
 
 * GNU make now uses automake to control Makefile.in generation.  This
diff --git a/SMakefile.template b/SMakefile.template
index e6bda7f..4705713 100644
--- a/SMakefile.template
+++ b/SMakefile.template
@@ -192,7 +192,7 @@ clean: glob-clean
 	-$(RM) -f make loadavg *.o core make.dvi
 
 distclean: clean glob-realclean
-	-$(RM) -f Makefile config.h config.status build.sh stamp-config
+	-$(RM) -f Makefile config.h config.status build.sh
 	-$(RM) -f config.log config.cache
 	-$(RM) -f TAGS tags
 	-$(RM) -f make.?? make.??s make.log make.toc make.*aux
diff --git a/configure.in b/configure.in
index 7dfe0bc..655ee7e 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_REVISION([$Id$])
 AC_PREREQ(2.12)dnl		dnl Minimum Autoconf version required.
 AC_INIT(vpath.c)dnl		dnl A distinctive file to look for in srcdir.
 
-AM_INIT_AUTOMAKE(make, 3.76)
+AM_INIT_AUTOMAKE(make, 3.76.1)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SUBDIRS(glob)
 
@@ -114,10 +114,7 @@ if ( /usr/sccs/admin -n s.conftest || admin -n s.conftest ) >/dev/null 2>&1 &&
 fi
 rm -f s.conftest conftoast
 
-AC_OUTPUT(Makefile build.sh, [
-# Makefile uses this timestamp file to know when to remake Makefile,
-# build.sh, and glob/Makefile.
-touch stamp-config])
+AC_OUTPUT(Makefile build.sh)
 
 dnl Local Variables:
 dnl comment-start: "dnl "
diff --git a/main.c b/main.c
index 11bfc88..0cf58fb 100644
--- a/main.c
+++ b/main.c
@@ -1256,7 +1256,7 @@ int main (int argc, char ** argv)
       time_t *makefile_mtimes = 0;
       unsigned int mm_idx = 0;
       char **nargv = argv;
-      char nargc = argc;
+      int nargc = argc;
 
       if (debug_flag)
 	puts ("Updating makefiles....");
diff --git a/maintMakefile b/maintMakefile
index 05e73e8..5aab784 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -44,8 +44,13 @@ build.sh.in: build.template Makefile.am
 # you shouldn't remove configure, etc., but this makefile is only available
 # in a full development distribution, so they'll only be removed then.
 #
-MAINTAINERCLEANFILES =  $(TEMPLATES) Makefile.DOS build.sh.in \
-			configure Makefile.in stamp-h.in
+# And _I_ want them to be removed ;)
+#
+maintFILES = configure aclocal.m4 config.h.in Makefile.in \
+	     stamp-h.in glob/stamp-h.in
+
+MAINTAINERCLEANFILES =  $(TEMPLATES) missing Makefile.DOS build.sh.in \
+			$(maintFILES)
 
 # Put the alpha distribution files up for anonymous FTP.
 #