Regenerated for 3.74

.
Regenerated
2026-08-21 01:13:27 +08:00 · 1995-05-19 20:40:12 +00:00 · 1995-05-19 20:37:02 +00:00 · 1995-05-10 21:59:24 +00:00 · 1995-05-10 21:58:53 +00:00 · 1995-05-10 21:57:56 +00:00
24 changed files with 5464 additions and 5380 deletions
--- a/5082
+++ b/5082
--- a/ChangeLog.1
+++ b/ChangeLog.1
--- a/9
+++ b/9
@@ -1,6 +1,6 @@
 # GNU Make-specific makefile for GNU Make.

-# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1990, 91, 92, 93, 94, 95 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 # 
 # GNU Make is free software; you can redistribute it and/or modify
@@ -50,6 +50,7 @@ exec_prefix = $(prefix)
 extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
 LOADLIBES := $(filter-out @%@,$(LOADLIBES))
 ALLOCA := $(filter-out @%@,$(ALLOCA))
+CPPFLAGS := $(filter-out @%@,$(defines) $(CPPFLAGS)) -DHAVE_CONFIG_H

 ifdef AC_MACRODIR
 configure config.h.in: $(patsubst %,$(AC_MACRODIR)/%.m4,acspecific acgeneral)
@@ -92,8 +93,6 @@ GLOB =

 else

-CPPFLAGS := $(filter-out @%@,$(CPPFLAGS)) -Iglob
-
 endif	 # works-for-make
 endif	 # $(libc_dir)
 endif	 # !no_libc
@@ -114,7 +113,7 @@ $(archpfx)load.o: load.c
 $(archpfx)load.dep: load.c
 	$(mkdep) $(LOAD_AVG) $< | sed 's,$*\.o,& $@,' > $@

-CPPFLAGS := -I$(ARCH) $(CPPFLAGS) -DHAVE_CONFIG_H $(filter-out @%@,$(defines))
+CPPFLAGS := -I$(ARCH) -DHAVE_CONFIG_H $(filter-out @%@,$(CPPFLAGS))

 ifneq "$(wildcard $(ARCH)/makefile)" ""
 include $(ARCH)/makefile
@@ -155,7 +154,7 @@ globfiles = $(addprefix glob/,COPYING.LIB configure.in configure Makefile.in \
 			configure.bat glob.c fnmatch.c glob.h fnmatch.h)
 $(globfiles): stamp-glob ;
 stamp-glob: /home/gd/gnu/libc/posix/glob.tar
-	-rm -rf glob
+	-rm -f $(globfiles)
 	tar xvf $< glob
 	cvs commit -m'Updated from libc' glob
 	touch $@
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,6 +216,7 @@ $(infodir)/make.info: make.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
 	  install-info --infodir=$(infodir) $$dir/make.info; \
 	else true; fi

@@ -284,7 +285,7 @@ $(objs): config.h
 commands.o : commands.c make.h dep.h commands.h file.h variable.h job.h 
 job.o: job.c make.h commands.h job.h file.h variable.h
 dir.o: dir.c make.h
-file.o : file.c make.h commands.h dep.h file.h variable.h 
+file.o: file.c make.h commands.h dep.h file.h variable.h
 misc.o: misc.c make.h dep.h
 main.o: main.c make.h commands.h dep.h file.h variable.h job.h getopt.h
 read.o: read.c make.h commands.h dep.h file.h variable.h glob/glob.h
@@ -294,7 +295,7 @@ implicit.o : implicit.c make.h rule.h dep.h file.h
 default.o: default.c make.h rule.h dep.h file.h commands.h variable.h
 variable.o : variable.c make.h commands.h variable.h dep.h file.h 
 expand.o: expand.c make.h commands.h file.h variable.h
-function.o : function.c make.h variable.h dep.h commands.h job.h 
+function.o: function.c make.h variable.h dep.h commands.h job.h
 vpath.o : vpath.c make.h file.h variable.h 
 version.o: version.c
 ar.o : ar.c make.h file.h dep.h 
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-This directory contains the 3.72.10 test release of GNU Make.
+This directory contains the 3.74 test release of GNU Make.
 All bugs reported for previous test releases have been fixed.
 Some bugs surely remain.

--- a/1
+++ b/1
@@ -216,6 +216,7 @@ $(infodir)/make.info: make.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
 	  install-info --infodir=$(infodir) $$dir/make.info; \
 	else true; fi

--- a/config.h.in
+++ b/config.h.in
@@ -20,10 +20,6 @@
 /* Define for DGUX with <sys/dg_sys_info.h>.  */
 #undef DGUX

-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-#undef GETGROUPS_T
-
 /* Define if the `getloadavg' function needs to be run setuid or setgid.  */
 #undef GETLOADAVG_PRIVILEGED

--- a/153
+++ b/153
@@ -1,8 +1,8 @@
 #! /bin/sh

-# From configure.in Id: configure.in,v 1.47 1995/02/22 03:18:18 roland Alpha 
+# From configure.in Id: configure.in,v 1.48 1995/03/21 21:23:26 roland Exp 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.1.3 
+# Generated automatically using autoconf version 2.3 
 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -219,7 +219,7 @@ EOF
    verbose=yes ;;

  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.1.3"
+    echo "configure generated by autoconf version 2.3"
    exit 0 ;;

  -with-* | --with-*)
@@ -385,8 +385,8 @@ fi
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
-ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'

 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -973,77 +973,12 @@ EOF
 EOF

 fi
-			echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_type_getgroups=cross
-else
-cat > conftest.$ac_ext <<EOF
-#line 985 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Rendell for this test.  */
-#include <sys/types.h>
-#define NGID 256
-#undef MAX
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
-main()
-{
-  gid_t gidset[NGID];
-  int i, n;
-  union { gid_t gval; long lval; }  val;
-
-  val.lval = -1;
-  for (i = 0; i < NGID; i++)
-    gidset[i] = val.gval;
-  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
-                 gidset);
-  /* Exit non-zero if getgroups seems to require an array of ints.  This
-     happens when gid_t is short but getgroups modifies an array of ints.  */
-  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
-}
-
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-    ac_cv_type_getgroups=gid_t
-else
-  ac_cv_type_getgroups=int
-fi
-fi
-rm -fr conftest*
-if test $ac_cv_type_getgroups = cross; then
-        cat > conftest.$ac_ext <<EOF
-#line 1020 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getgroups.*int.*gid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_getgroups=gid_t
-else
-  rm -rf conftest*
-  ac_cv_type_getgroups=int
-fi
-rm -f conftest*
-
-fi
-fi
-echo "$ac_t""$ac_cv_type_getgroups" 1>&6
-cat >> confdefs.h <<EOF
-#define GETGROUPS_T $ac_cv_type_getgroups
-EOF
-
-
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+			echo $ac_n "checking for pid_t""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1047 "configure"
+#line 982 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1074,7 +1009,7 @@ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1078 "configure"
+#line 1013 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1115,7 +1050,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1119 "configure"
+#line 1054 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1191,7 +1126,7 @@ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1195 "configure"
+#line 1130 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1263,7 +1198,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1267 "configure"
+#line 1202 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1325,7 +1260,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1329 "configure"
+#line 1264 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -1374,7 +1309,7 @@ if eval "test \"`echo '$''{'ac_cv_check_symbol_sys_siglist'+set}'`\" = set"; the
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1378 "configure"
+#line 1313 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1406,7 +1341,7 @@ if eval "test \"`echo '$''{'ac_cv_check_symbol__sys_siglist'+set}'`\" = set"; th
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1410 "configure"
+#line 1345 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1440,7 +1375,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1444 "configure"
+#line 1379 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1471,7 +1406,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1475 "configure"
+#line 1410 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -1529,7 +1464,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1533 "configure"
+#line 1468 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1557,7 +1492,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1561 "configure"
+#line 1496 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -1611,7 +1546,7 @@ else
  ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 1615 "configure"
+#line 1550 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1652,7 +1587,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1656 "configure"
+#line 1591 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
@@ -1686,7 +1621,7 @@ else
  ac_cv_func_vfork=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 1690 "configure"
+#line 1625 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -1804,7 +1739,7 @@ else
    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1808 "configure"
+#line 1743 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -1848,7 +1783,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lelf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1852 "configure"
+#line 1787 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1881,7 +1816,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lkvm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+#line 1820 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1915,7 +1850,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1919 "configure"
+#line 1854 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1953,7 +1888,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lgetloadavg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1957 "configure"
+#line 1892 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -1990,7 +1925,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1994 "configure"
+#line 1929 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -2048,7 +1983,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2052 "configure"
+#line 1987 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
 EOF
@@ -2077,7 +2012,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-ldgc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2081 "configure"
+#line 2016 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -2131,7 +2066,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2135 "configure"
+#line 2070 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
 EOF
@@ -2170,7 +2105,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2174 "configure"
+#line 2109 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
 EOF
@@ -2207,7 +2142,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2211 "configure"
+#line 2146 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -2243,7 +2178,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2247 "configure"
+#line 2182 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
@@ -2270,7 +2205,7 @@ EOF
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2274 "configure"
+#line 2209 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 int main() { return 0; }
@@ -2307,7 +2242,7 @@ if eval "test \"`echo '$''{'ac_cv_func_getloadavg_setgid'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2311 "configure"
+#line 2246 "configure"
 #include "confdefs.h"
 #include "$srcdir/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
@@ -2362,7 +2297,7 @@ else
  ac_cv_func_strcoll=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 2366 "configure"
+#line 2301 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -2396,7 +2331,7 @@ if test $ac_cv_func_getdtablesize = no; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
    cat > conftest.$ac_ext <<EOF
-#line 2400 "configure"
+#line 2335 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -2433,7 +2368,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
+#line 2372 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -2467,7 +2402,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2471 "configure"
+#line 2406 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -2516,7 +2451,7 @@ if eval "test \"`echo '$''{'make_cv_union_wait'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2520 "configure"
+#line 2455 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2564,7 +2499,7 @@ if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2568 "configure"
+#line 2503 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2605,7 +2540,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2609 "configure"
+#line 2544 "configure"
 #include "confdefs.h"

 int main() { return 0; }
@@ -2751,7 +2686,7 @@ do
    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.1.3"
+    echo "$CONFIG_STATUS generated by autoconf version 2.3"
    exit 0 ;;
  -help | --help | --hel | --he | --h)
    echo "\$ac_cs_usage"; exit 0 ;;
@@ -2762,7 +2697,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"

-trap 'rm -fr `echo Makefile build.sh config.h | tr : " "` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile build.sh config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15

 # Protect against being on the right side of a sed subst in config.status. 
 sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
--- a/configure.bat
+++ b/configure.bat
@@ -17,7 +17,8 @@ echo "}							">> config.sed

 echo "s/@srcdir@/./					">> config.sed
 echo "s/@CC@/gcc/					">> config.sed
-echo "s/@CFLAGS@/-O2 -g -DHAVE_CONFIG_H/		">> config.sed
+echo "s/@CFLAGS@/-O2 -g/				">> config.sed
+echo "s/@CPPFLAGS@/-DHAVE_CONFIG_H/			">> config.sed
 echo "s/@LDFLAGS@//					">> config.sed
 echo "s/@RANLIB@/ranlib/				">> config.sed
 echo "s/@DEFS@//					">> config.sed
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,6 @@ AC_MINIX
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_TYPE_UID_T			dnl Also does gid_t.
-AC_TYPE_GETGROUPS
 AC_TYPE_PID_T
 AC_TYPE_SIGNAL
 AC_CHECK_HEADERS(unistd.h limits.h sys/param.h fcntl.h string.h memory.h \
--- a/file.c
+++ b/file.c
@@ -1,5 +1,5 @@
 /* Target file hash table management for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "dep.h"
 #include "file.h"
 #include "variable.h"
+#include <assert.h>


 /* Hash table of files the makefile knows how to make.  */
@@ -294,7 +295,9 @@ remove_intermediates (sig)
  register struct file *f;
  char doneany;
  
-  if (!sig && just_print_flag)
+  if (question_flag || touch_flag)
+    return;
+  if (sig && just_print_flag)
    return;

  doneany = 0;
@@ -303,7 +306,11 @@ remove_intermediates (sig)
      if (f->intermediate && (f->dontcare || !f->precious))
 	{
 	  int status;
-	  if (just_print_flag)
+	  if (f->update_status == -1)
+	    /* If nothing would have created this file yet,
+	       don't print an "rm" command for it.  */
+	    continue;
+	  else if (just_print_flag)
 	    status = 0;
 	  else
 	    {
@@ -491,6 +498,10 @@ print_file (f)
 	  puts ("#  Successfully updated.");
 	  break;
 	case 1:
+	  assert (question_flag);
+	  puts ("#  Needs to be updated (-q is set).");
+	  break;
+	case 2:
 	  puts ("#  Failed to be updated.");
 	  break;
 	default:
--- a/function.c
+++ b/function.c
@@ -1,5 +1,5 @@
 /* Variable function expansion for GNU Make.
-Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 91, 92, 93, 94, 95 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */

 #ifdef __MSDOS__
 #include <process.h>
+#include <fcntl.h>
 #endif

 static char *string_glob ();
--- a/getloadavg.c
+++ b/getloadavg.c
@@ -210,6 +210,10 @@ extern int errno;
 #define LOAD_AVE_TYPE long
 #endif

+#ifdef _AIX
+#define LOAD_AVE_TYPE long
+#endif
+
 #endif /* No LOAD_AVE_TYPE.  */

 #ifdef OSF_ALPHA
@@ -254,6 +258,10 @@ extern int errno;
 #define FSCALE 100.0
 #endif

+#ifdef _AIX
+#define FSCALE 65536.0
+#endif
+
 #endif	/* Not FSCALE.  */

 #if !defined (LDAV_CVT) && defined (FSCALE)
@@ -315,6 +323,10 @@ extern int errno;
 #define NLIST_STRUCT
 #endif

+#ifdef _AIX
+#define NLIST_STRUCT
+#endif
+
 #endif /* defined (NLIST_STRUCT) */


@@ -340,7 +352,7 @@ extern int errno;
 #define LDAV_SYMBOL "_Loadavg"
 #endif

-#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)))
+#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
 #define LDAV_SYMBOL "avenrun"
 #endif

@@ -790,23 +802,29 @@ getloadavg (loadavg, nelem)
 #endif /* NLIST_STRUCT */

 #ifndef SUNOS_5
-      if (nlist (KERNEL_FILE, nl) >= 0)
-	/* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
-	{
-#ifdef FIXUP_KERNEL_SYMBOL_ADDR
-	  FIXUP_KERNEL_SYMBOL_ADDR (nl);
+      if (
+#ifndef _AIX
+	  nlist (KERNEL_FILE, nl)
+#else  /* _AIX */
+	  knlist (nl, 1, sizeof (nl[0]))
 #endif
-	  offset = nl[0].n_value;
-	}
-#endif  /* !SUNOS_5 */
-#else /* sgi */
-      int ldav_off;
+	  >= 0)
+	  /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
+	  {
+#ifdef FIXUP_KERNEL_SYMBOL_ADDR
+	    FIXUP_KERNEL_SYMBOL_ADDR (nl);
+#endif
+	    offset = nl[0].n_value;
+	  }
+#endif /* !SUNOS_5 */
+#else  /* sgi */
+	  int ldav_off;

-      ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
-      if (ldav_off != -1)
-	offset = (long) ldav_off & 0x7fffffff;
+	  ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
+	  if (ldav_off != -1)
+	  offset = (long) ldav_off & 0x7fffffff;
 #endif /* sgi */
-    }
+	}

  /* Make sure we have /dev/kmem open.  */
  if (!getloadavg_initialized)
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -0,0 +1,57 @@
+Sat Apr 29 15:46:57 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (S_ISDIR): Define if undefined.
+
+Tue Apr 25 17:17:19 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (glob): If GLOB_MARK set, stat names to find
+ 	directories and append slashes to them in final pass before
+ 	sorting.
+	(glob_in_dir): If GLOB_MARK set, just allocate the extra char for the
+	slash; never append it here.
+
+Wed Mar  8 13:38:13 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob/configure.bat: Fixes from DJ.
+
+Wed Feb 22 00:44:41 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob/configure.in: Put AC_ISC_POSIX before AC_CONST.
+
+Sun Feb  5 17:59:53 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* malloc/malloc.c (__malloc_extra_blocks): New variable.
+	(malloc): When getting more core, get __malloc_extra_blocks extra;
+	put the new block at the end of the free list and let the next loop
+ 	iteration use the initial portion of it.
+	* malloc/free.c (_free_internal): Account for twice
+ 	__malloc_extra_blocks in deciding if we have so much extra memory
+ 	we should return it to the system.
+	* malloc/malloc.h (__malloc_extra_blocks): Declare it.
+	* posix/glob.c (prefix_array, glob_pattern_p): Remove gratuitous
+ 	const in parameter decl.
+
+Fri Jan 27 17:53:49 1995  Jim Meyering  (meyering@comco.com)
+
+	* posix/fnmatch.c: Declare errno if it's not defined.
+	That's simpler than testing #if !defined(__GNU_LIBRARY__)
+	&& !defined(STDC_HEADERS).
+
+Thu Jan 26 00:02:01 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* io/ftw.c: Avoid `ret' as variable name.
+	* posix/glob.c: Likewise.
+
+Wed Jan 25 00:45:56 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob/configure.in: Put AC_AIX and AC_MINIX early, before
+ 	any compile tests.
+
+Mon Jan 16 15:49:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob/Makefile.in: Remove config.h and config.log.
+
+Sun Jan 15 06:56:47 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob/configure.in: Add AC_CONST check.
+
--- a/glob/configure.bat
+++ b/glob/configure.bat
@@ -1,23 +1,26 @@
-@echo off
-echo Configuring glob for GO32
-rem This batch file assumes a unix-type "sed" program
-
-echo # Makefile generated by "configure.bat"> Makefile
-
-if exist config.sed del config.sed
-
-echo "s/@srcdir@/./					">> config.sed
-echo "s/@RANLIB@/ranlib/				">> config.sed
-echo "s/@LDFLAGS@//					">> config.sed
-echo "s/@DEFS@/-DHAVE_CONFIG_H -I../			">> config.sed
-echo "s/@REMOTE@/s/					">> config.sed
-echo "s/@ALLOCA@//					">> config.sed
-echo "s/@LIBS@//					">> config.sed
-echo "s/@LIBOBJS@//					">> config.sed
-echo "s/^Makefile *:/_Makefile:/			">> config.sed
-echo "s/^config.h *:/_config.h:/			">> config.sed
-
-sed -e "s/^\"//" -e "s/\"$//" -e "s/[ 	]*$//" config.sed > config2.sed
-sed -f config2.sed Makefile.in >> Makefile
-del config.sed
-del config2.sed
+@echo off
+echo Configuring glob for GO32
+rem This batch file assumes a unix-type "sed" program
+
+echo # Makefile generated by "configure.bat"> Makefile
+
+if exist config.sed del config.sed
+
+echo "s/@srcdir@/./					">> config.sed
+echo "s/@CC@/gcc/					">> config.sed
+echo "s/@CFLAGS@/-O2 -g/				">> config.sed
+echo "s/@CPPFLAGS@/-DHAVE_CONFIG_H -I../		">> config.sed
+echo "s/@AR@/ar/					">> config.sed
+echo "s/@RANLIB@/ranlib/				">> config.sed
+echo "s/@LDFLAGS@//					">> config.sed
+echo "s/@DEFS@//					">> config.sed
+echo "s/@ALLOCA@//					">> config.sed
+echo "s/@LIBS@//					">> config.sed
+echo "s/@LIBOBJS@//					">> config.sed
+echo "s/^Makefile *:/_Makefile:/			">> config.sed
+echo "s/^config.h *:/_config.h:/			">> config.sed
+
+sed -e "s/^\"//" -e "s/\"$//" -e "s/[ 	]*$//" config.sed > config2.sed
+sed -f config2.sed Makefile.in >> Makefile
+del config.sed
+del config2.sed
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -26,6 +26,7 @@ Cambridge, MA 02139, USA.  */

 #include <errno.h>
 #include <sys/types.h>
+#include <sys/stat.h>


 /* Comment out all this code if we are using the GNU C Library, and are not
@@ -173,6 +174,19 @@ extern char *alloca ();

 #endif

+#ifndef __GNU_LIBRARY__
+#define __lstat lstat
+#ifndef HAVE_LSTAT
+#define lstat stat
+#endif
+#ifdef STAT_MACROS_BROKEN
+#undef S_ISDIR
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+#endif
+
 #ifndef	STDC_HEADERS
 #undef	size_t
 #define	size_t	unsigned int
@@ -394,9 +408,21 @@ glob (pattern, flags, errfunc, pglob)
 	}
    }

+  if (flags & GLOB_MARK)
+    {
+      /* Append slashes to directory names.  glob_in_dir has already
+	 allocated the extra character for us.  */
+      int i;
+      struct stat st;
+      for (i = oldcount; i < pglob->gl_pathc; ++i)
+	if (__lstat (pglob->gl_pathv[i], &st) == 0 &&
+	    S_ISDIR (st.st_mode))
+	  strcat (pglob->gl_pathv[i], "/");
+    }
+
  if (!(flags & GLOB_NOSORT))
    /* Sort the vector.  */
-    qsort ((__ptr_t) & pglob->gl_pathv[oldcount],
+    qsort ((__ptr_t) &pglob->gl_pathv[oldcount],
 	   pglob->gl_pathc - oldcount,
 	   sizeof (char *), collated_compare);

@@ -595,8 +621,6 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 		if (new->name == NULL)
 		  goto memory_error;
 		memcpy ((__ptr_t) new->name, name, len);
-		if (flags & GLOB_MARK)
-		  new->name[len++] = '/';
 		new->name[len] = '\0';
 		new->next = names;
 		names = new;
@@ -611,12 +635,10 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
      nfound = 1;
      names = (struct globlink *) __alloca (sizeof (struct globlink));
      names->next = NULL;
-      names->name = (char *) malloc (len + ((flags & GLOB_MARK) ? 1 : 0) + 1);
+      names->name = (char *) malloc (len + 1);
      if (names->name == NULL)
 	goto memory_error;
      memcpy (names->name, pattern, len);
-      if (flags & GLOB_MARK)
-	names->name[len++] = '/';
      names->name[len] = '\0';
    }

--- a/job.c
+++ b/job.c
@@ -377,7 +377,7 @@ reap_children (block, err)
 		 delete non-precious targets, and abort.  */
 	      static int delete_on_error = -1;
 	      child_error (c->file->name, exit_code, exit_sig, coredump, 0);
-	      c->file->update_status = 1;
+	      c->file->update_status = 2;
 	      if (delete_on_error == -1)
 		{
 		  struct file *f = lookup_file (".DELETE_ON_ERROR");
@@ -405,7 +405,7 @@ reap_children (block, err)
 			 Since there are more commands that wanted to be run,
 			 the target was not completely remade.  So we treat
 			 this as if a command had failed.  */
-		      c->file->update_status = 1;
+		      c->file->update_status = 2;
 		    }
 		  else
 		    {
@@ -433,7 +433,7 @@ reap_children (block, err)
 	    }

 	  /* When we get here, all the commands for C->file are finished
-	     (or aborted) and C->file->update_status contains 0 or 1.  But
+	     (or aborted) and C->file->update_status contains 0 or 2.  But
 	     C->file->command_state is still cs_running if all the commands
 	     ran; notice_finish_file looks for cs_running to tell it that
 	     it's interesting to check the file's modtime again now.  */
@@ -945,23 +945,17 @@ new_job (file)
  c->environment = 0;

  /* Fetch the first command line to be run.  */
-  if (! job_next_command (c))
-    {
-      /* There were no commands!  */
-      free_child (c);
-      c->file->update_status = 0;
-    }
-  else
-    {
-      /* The job is now primed.  Start it running.  */
-      start_waiting_job (c);
+  job_next_command (c);

-      if (job_slots == 1)
-	/* Since there is only one job slot, make things run linearly.
-	   Wait for the child to die, setting the state to `cs_finished'.  */
-	while (file->command_state == cs_running)
-	  reap_children (1, 0);
-    }
+  /* The job is now primed.  Start it running.
+     (This will notice if there are in fact no commands.)  */
+  start_waiting_job (c);
+
+  if (job_slots == 1)
+    /* Since there is only one job slot, make things run linearly.
+       Wait for the child to die, setting the state to `cs_finished'.  */
+    while (file->command_state == cs_running)
+      reap_children (1, 0);
 }

 /* Move CHILD's pointers to the next command for it to execute.
@@ -971,7 +965,7 @@ static int
 job_next_command (child)
     struct child *child;
 {
-  if (child->command_ptr == 0 || *child->command_ptr == '\0')
+  while (child->command_ptr == 0 || *child->command_ptr == '\0')
    {
      /* There are no more lines in the expansion of this line.  */
      if (child->command_line == child->file->cmds->ncommand_lines)
@@ -1071,111 +1065,6 @@ child_execute_job (stdin_fd, stdout_fd, argv, envp)
  exec_command (argv, envp);
 }

-#if 0
-
-/* Default path to search for executables.  */
-static char default_path[] = ":/bin:/usr/bin";
-
-/* Search PATH for FILE.
-   If successful, store the full pathname in PROGRAM and return 1.
-   If not sucessful, return zero.  */
-
-static int
-search_path (file, path, program)
-     char *file, *path, *program;
-{
-  if (path == 0 || path[0] == '\0')
-    path = default_path;
-
-  if (
-#ifdef __MSDOS__
-      strpbrk (file, "/\\:")
-#else
-      index (file, '/') 
-#endif
-      != 0)
-    {
-      strcpy (program, file);
-      return 1;
-    }
-  else
-    {
-      unsigned int len;
-
-#ifdef	HAVE_GETGROUPS
-#ifndef	HAVE_UNISTD_H
-      extern int getgroups ();
-#endif
-      static int ngroups = -1;
-#ifdef	NGROUPS_MAX
-      static GETGROUPS_T groups[NGROUPS_MAX];
-#define	ngroups_max	NGROUPS_MAX
-#else
-      static GETGROUPS_T *groups = 0;
-      static int ngroups_max;
-      if (groups == 0)
-	{
-	  ngroups_max = GET_NGROUPS_MAX;
-	  groups = (GETGROUPS_T *) malloc (ngroups_max * sizeof (GETGROUPS_T));
-	}
-#endif
-      if (groups != 0 && ngroups == -1)
-	ngroups = getgroups (ngroups_max, groups);
-#endif	/* Have getgroups.  */
-
-      len = strlen (file) + 1;
-      do
-	{
-	  struct stat st;
-	  int perm;
-	  char *p;
-
-	  p = index (path, PATH_SEPARATOR_CHAR);
-	  if (p == 0)
-	    p = path + strlen (path);
-
-	  if (p == path)
-	    bcopy (file, program, len);
-	  else
-	    {
-	      bcopy (path, program, p - path);
-	      program[p - path] = '/';
-	      bcopy (file, program + (p - path) + 1, len);
-	    }
-
-	  if (safe_stat (program, &st) == 0
-	      && S_ISREG (st.st_mode))
-	    {
-	      if (st.st_uid == geteuid ())
-		perm = (st.st_mode & 0100);
-	      else if (st.st_gid == getegid ())
-		perm = (st.st_mode & 0010);
-	      else
-		{
-#ifdef	HAVE_GETGROUPS
-		  register int i;
-		  for (i = 0; i < ngroups; ++i)
-		    if (groups[i] == st.st_gid)
-		      break;
-		  if (i < ngroups)
-		    perm = (st.st_mode & 0010);
-		  else
-#endif	/* Have getgroups.  */
-		    perm = (st.st_mode & 0001);
-		}
-
-	      if (perm != 0)
-		return 1;
-	    }
-
-	  path = p + 1;
-	} while (*path != '\0');
-    }
-
-  return 0;
-}
-#endif /* search_path commented out */
-
 /* Replace the current process with one running the command in ARGV,
   with environment ENVP.  This function does not return.  */

--- a/main.c
+++ b/main.c
@@ -23,6 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "variable.h"
 #include "job.h"
 #include "getopt.h"
+#include <assert.h>


 extern void print_variable_data_base ();
@@ -923,14 +924,17 @@ main (argc, argv, envp)

      switch (update_goal_chain (read_makefiles, 1))
 	{
+	case 1:
 	default:
-	  abort ();
+#define BOGUS_UPDATE_STATUS 0
+	  assert (BOGUS_UPDATE_STATUS);
+	  break;
 	  
 	case -1:
 	  /* Did nothing.  */
 	  break;
 	  
-	case 1:
+	case 2:
 	  /* Failed to update.  Figure out if we care.  */
 	  {
 	    /* Nonzero if any makefile was successfully remade.  */
@@ -1198,6 +1202,51 @@ init_switches ()
  long_options[i].name = 0;
 }

+static void
+handle_non_switch_argument (arg, env)
+     char *arg;
+     int env;
+{
+  /* Non-option argument.  It might be a variable definition.  */
+  struct variable *v;
+  if (arg[0] == '-' && arg[1] == '\0')
+    /* Ignore plain `-' for compatibility.  */
+    return;
+  v = try_variable_definition ((char *) 0, 0, arg, o_command);
+  if (v != 0)
+    {
+      /* It is indeed a variable definition.  Record a pointer to
+	 the variable for later use in define_makeflags.  */
+      struct command_variable *cv
+	= (struct command_variable *) xmalloc (sizeof (*cv));
+      cv->variable = v;
+      cv->next = command_variables;
+      command_variables = cv;
+    }
+  else if (! env)
+    {
+      /* Not an option or variable definition; it must be a goal
+	 target!  Enter it as a file and add it to the dep chain of
+	 goals.  */
+      struct file *f = enter_command_line_file (arg);
+      f->cmd_target = 1;
+	  
+      if (goals == 0)
+	{
+	  goals = (struct dep *) xmalloc (sizeof (struct dep));
+	  lastgoal = goals;
+	}
+      else
+	{
+	  lastgoal->next
+	    = (struct dep *) xmalloc (sizeof (struct dep));
+	  lastgoal = lastgoal->next;
+	}
+      lastgoal->name = 0;
+      lastgoal->file = f;
+    }
+}
+
 /* Decode switches from ARGC and ARGV.
   They came from the environment if ENV is nonzero.  */

@@ -1221,67 +1270,18 @@ decode_switches (argc, argv, env)
     but not for options from the environment.  */
  opterr = !env;
  /* Reset getopt's state.  */
-  optind = 1;
+  optind = 0;

  while (optind < argc)
    {
      /* Parse the next argument.  */
      c = getopt_long (argc, argv, options, long_options, (int *) 0);
      if (c == EOF)
-	{
-	  /* There are no more options according to getting getopt, but
-	     there are some arguments left.  Since we have asked for
-	     non-option arguments to be returned in order, I think this
-	     only happens when there is a "--" argument to prevent later
-	     arguments from being options.  Since getopt has finished its
-	     job, just update its state variables for the next argument and
-	     set C as if it had returned 1, indicating a non-option
-	     argument.  */
-	  optarg = argv[optind++];
-	  c = 1;
-	}
-
-      if (c == 1)
-	{
-	  /* Non-option argument.  It might be a variable definition.  */
-	  struct variable *v;
-	  if (optarg[0] == '-' && optarg[1] == '\0')
-	    /* Ignore plain `-' for compatibility.  */
-	    continue;
-	  v = try_variable_definition ((char *) 0, 0, optarg, o_command);
-	  if (v != 0)
-	    {
-	      /* It is indeed a variable definition.  Record a pointer to
-		 the variable for later use in define_makeflags.  */
-	      struct command_variable *cv
-		= (struct command_variable *) xmalloc (sizeof (*cv));
-	      cv->variable = v;
-	      cv->next = command_variables;
-	      command_variables = cv;
-	    }
-	  else if (! env)
-	    {
-	      /* Not an option or variable definition; it must be a goal
-		 target!  Enter it as a file and add it to the dep chain of
-		 goals.  */
-	      struct file *f = enter_command_line_file (optarg);
-	      f->cmd_target = 1;
-	  
-	      if (goals == 0)
-		{
-		  goals = (struct dep *) xmalloc (sizeof (struct dep));
-		  lastgoal = goals;
-		}
-	      else
-		{
-		  lastgoal->next
-		    = (struct dep *) xmalloc (sizeof (struct dep));
-		  lastgoal = lastgoal->next;
-		}
-	      lastgoal->name = 0;
-	      lastgoal->file = f;
-	    }
-	}
+	/* End of arguments, or "--" marker seen.  */
+	break;
+      else if (c == 1)
+	/* An argument not starting with a dash.  */
+	handle_non_switch_argument (optarg, env);
      else if (c == '?')
 	/* Bad option.  We will print a usage message and die later.
 	   But continue to parse the other options so the user can
@@ -1384,6 +1384,14 @@ positive integral argument",
 	    }
    }

+  /* There are no more options according to getting getopt, but there may
+     be some arguments left.  Since we have asked for non-option arguments
+     to be returned in order, this only happens when there is a "--"
+     argument to prevent later arguments from being options.  */
+  while (optind < argc)
+    handle_non_switch_argument (argv[optind++], env);
+
+
  if (!env && (bad || print_usage_flag))
    {
      /* Print a nice usage message.  */
--- a/make.texinfo
+++ b/make.texinfo
@@ -8,10 +8,11 @@
@c FSF publishers: format makebook.texi instead of using this file directly.

@set RCSID $Id$
-@set EDITION 0.47
-@set VERSION 3.72 Beta
-@set UPDATED 1 November 1994
-@set UPDATE-MONTH November 1994
+@set EDITION 0.48
+@set VERSION 3.73 Beta
+@set UPDATED 4 April 1995
+@set UPDATE-MONTH April 1995
+@comment The ISBN number might need to change on next publication.
@set ISBN 1-882114-50-7

@c finalout
@@ -31,7 +32,8 @@ and issues the commands to recompile them.
 This is Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The GNU Make Manual}, for @code{make}, Version @value{VERSION}.

-Copyright (C) 1988, '89, '90, '91, '92, '93, '94 Free Software Foundation, Inc.
+Copyright (C) 1988, '89, '90, '91, '92, '93, '94, '95
+	Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -66,7 +68,7 @@ by the Free Software Foundation.
@author Richard M. Stallman and Roland McGrath
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1988, '89, '90, '91, '92, '93, '94 Free Software Foundation, Inc.
+Copyright @copyright{} 1988, '89, '90, '91, '92, '93, '94, '95 Free Software Foundation, Inc.
@sp 2
 Published by the Free Software Foundation @*
 675 Massachusetts Avenue, @*
@@ -3294,23 +3296,20 @@ definitions just as if they appeared on the command line.

@cindex @code{-C}, and recursion
@cindex @code{-f}, and recursion
-@cindex @code{-I}, and recursion
@cindex @code{-o}, and recursion
@cindex @code{-W}, and recursion
@cindex @code{--directory}, and recursion
@cindex @code{--file}, and recursion
-@cindex @code{--include-dir}, and recursion
@cindex @code{--old-file}, and recursion
@cindex @code{--assume-old}, and recursion
@cindex @code{--assume-new}, and recursion
@cindex @code{--new-file}, and recursion
@cindex recursion, and @code{-C}
@cindex recursion, and @code{-f}
-@cindex recursion, and @code{-I}
@cindex recursion, and @code{-o}
@cindex recursion, and @code{-W}
-The options @samp{-C}, @samp{-f}, @samp{-I}, @samp{-o}, and @samp{-W}
-are not put into @code{MAKEFLAGS}; these options are not passed down.@refill
+The options @samp{-C}, @samp{-f}, @samp{-o}, and @samp{-W} are not put
+into @code{MAKEFLAGS}; these options are not passed down.@refill

@cindex @code{-j}, and recursion
@cindex @code{--jobs}, and recursion
--- a/misc.c
+++ b/misc.c
@@ -126,7 +126,7 @@ remove_comments (line)
 {
  char *comment;

-  comment = find_char_unquote (line, '#', 0);
+  comment = find_char_unquote (line, "#", 0);

  if (comment != 0)
    /* Cut off the line at the #.  */
--- a/read.c
+++ b/read.c
@@ -1437,9 +1437,9 @@ record_files (filenames, pattern, pattern_percent, deps, commands_started,
   one, or nil if there are none.  */

 char *
-find_char_unquote (string, stopchar, blank)
+find_char_unquote (string, stopchars, blank)
     char *string;
-     int stopchar;
+     char *stopchars;
     int blank;
 {
  unsigned int string_len = strlen (string);
@@ -1447,19 +1447,12 @@ find_char_unquote (string, stopchar, blank)

  while (1)
    {
-      if (blank)
-	{
-	  while (*p != '\0' && *p != stopchar && !isblank (*p))
-	    ++p;
-	  if (*p == '\0')
-	    break;
-	}
-      else
-	{
-	  p = index (p, stopchar);
-	  if (p == 0)
-	    break;
-	}
+      while (*p != '\0' && index (stopchars, *p) == 0
+	     && (!blank || !isblank (*p)))
+	++p;
+      if (*p == '\0')
+	break;
+
      if (p > string && p[-1] == '\\')
 	{
 	  /* Search for more backslashes.  */
@@ -1493,7 +1486,7 @@ char *
 find_percent (pattern)
     char *pattern;
 {
-  return find_char_unquote (pattern, '%', 0);
+  return find_char_unquote (pattern, "%", 0);
 }

 /* Search STRING for an unquoted ; that is not after an unquoted #.  */
@@ -1502,8 +1495,11 @@ static char *
 find_semicolon (string)
     char *string;
 {
-  return (find_char_unquote (string, '#', 0) == 0
-	  ? find_char_unquote (string, ';', 0) : 0);
+  char *match = find_char_unquote (string, ";#", 0);
+  if (match != 0 && *match == '#')
+    /* We found a comment before a semicolon.  No match.  */
+    match = 0;
+  return match;
 }

 /* Parse a string into a sequence of filenames represented as a
@@ -1531,6 +1527,9 @@ parse_file_seq (stringp, stopchar, size, strip)
  register char *p = *stringp;
  char *q;
  char *name;
+  char stopchars[2];
+  stopchars[0] = stopchar;
+  stopchars[1] = '\0';

  while (1)
    {
@@ -1542,7 +1541,7 @@ parse_file_seq (stringp, stopchar, size, strip)
 	break;
      /* Yes, find end of next name.  */
      q = p;
-      p = find_char_unquote (q, stopchar, 1);
+      p = find_char_unquote (q, stopchars, 1);
 #ifdef __MSDOS__
      /* For MS-DOS, skip a "C:\...".  */
      if (stopchar == ':' && p != 0 && p[1] == '\\' && isalpha (p[-1]))
@@ -1583,7 +1582,9 @@ parse_file_seq (stringp, stopchar, size, strip)
     an elt further down the chain (i.e., previous in the file list)
     with an unmatched `(' (e.g., "lib(mem").  */

-  for (new1 = new, lastnew1 = 0; new1 != 0; lastnew1 = new1, new1 = new1->next)
+  new1 = new;
+  lastnew1 = 0;
+  while (new1 != 0)
    if (new1->name[0] != '('	/* Don't catch "(%)" and suchlike.  */
 	&& new1->name[strlen (new1->name) - 1] == ')'
 	&& index (new1->name, '(') == 0)
@@ -1664,14 +1665,21 @@ parse_file_seq (stringp, stopchar, size, strip)
 		name = concat (libname, new1->name, ")");
 		free (new1->name);
 		new1->name = name;
+		lastnew1 = new1;
 		new1 = new1->next;
 	      }
-
-	    if (new1 == 0)
-	      /* We might have slurped up the whole list,
-		 and continuing the loop would dereference NEW1.  */
-	      break;
 	  }
+	else
+	  {
+	    /* No frobnication happening.  Just step down the list.  */
+	    lastnew1 = new1;
+	    new1 = new1->next;
+	  }
+      }
+    else
+      {
+	lastnew1 = new1;
+	new1 = new1->next;
      }

 #endif
--- a/remake.c
+++ b/remake.c
@@ -573,14 +573,17 @@ update_file_1 (file, depth)

  switch (file->update_status)
    {
-    case 1:
+    case 2:
      DEBUGPR ("Failed to remake target file `%s'.\n");
      break;
    case 0:
      DEBUGPR ("Successfully remade target file `%s'.\n");
      break;
+    case 1:
+      DEBUGPR ("Target file `%s' needs remade under -q.\n");
+      break;
    default:
-      assert (file->update_status == 0 || file->update_status == 1);
+      assert (file->update_status >= 0 && file->update_status <= 2);
      break;
    }

@@ -590,7 +593,9 @@ update_file_1 (file, depth)

 /* Set FILE's `updated' flag and re-check its mtime and the mtime's of all
   files listed in its `also_make' member.  Under -t, this function also
-   touches FILE.  */
+   touches FILE.
+
+   On return, FILE->update_status will no longer be -1 if it was.  */

 void
 notice_finished_file (file)
@@ -665,6 +670,10 @@ notice_finished_file (file)
 	     never be done because the target is already updated.  */
 	  (void) f_mtime (d->file, 0);
      }
+  else if (file->update_status == -1)
+    /* Nothing was done for FILE, but it needed nothing done.
+       So mark it now as "succeeded".  */
+    file->update_status = 0;
 }

 /* Check whether another file (whose mtime is THIS_MTIME)
@@ -833,15 +842,29 @@ remake_file (file)
      else
 	{
 	  /* This is a dependency file we cannot remake.  Fail.  */
-	  static char noway[] = "No rule to make target";
+	  static const char msg_noparent[]
+	    = "%sNo rule to make target `%s'%s";
+	  static const char msg_parent[]
+	    = "%sNo rule to make target `%s', needed by `%s'%s";
 	  if (keep_going_flag || file->dontcare)
 	    {
 	      if (!file->dontcare)
-		error ("*** %s `%s'.", noway, file->name);
- 	      file->update_status = 1;
+		{
+		  if (file->parent == 0)
+		    error (msg_noparent, "*** ", file->name, ".");
+		  else
+		    error (msg_parent, "*** ",
+			   file->name, file->parent->name, ".");
+		}
+ 	      file->update_status = 2;
 	    }
 	  else
-	    fatal ("%s `%s'", noway, file->name);
+	    {
+	      if (file->parent == 0)
+		fatal (msg_noparent, "", file->name, "");
+	      else
+		fatal (msg_parent, "", file->name, file->parent->name, "");
+	    }
 	}
    }
  else
--- a/signame.c
+++ b/signame.c
@@ -15,14 +15,22 @@ You should have received a copy of the GNU General Public License
 along with this program; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>		/* Some systems need this for <signal.h>.  */
 #include <signal.h>

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+/* Some systems declare `sys_siglist in <unistd.h>; if
+   configure defined SYS_SIGLIST_DECLARED, it may expect
+   to find the declaration there.  */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
 #endif

+
 /* Some systems do not define NSIG in <signal.h>.  */
 #ifndef	NSIG
 #ifdef	_NSIG
@@ -216,6 +224,9 @@ signame_init ()
 #if defined (SIGDANGER)
  init_sig (SIGDANGER, "DANGER", "Danger signal");
 #endif
+#if defined (SIGINFO)
+  init_sig (SIGINFO, "INFO", "Information request");
+#endif
 }

 /* Return the abbreviation for signal NUMBER.  */
--- a/version.c
+++ b/version.c
@@ -1,4 +1,4 @@
-char *version_string = "3.72.10";
+char *version_string = "3.74";

 /*
  Local variables:
Author	SHA1	Message	Date
Roland McGrath	b2fc502c55	Regenerated for 3.74	1995-05-19 20:40:12 +00:00
Roland McGrath	d091a08961	.	1995-05-19 20:37:02 +00:00
Roland McGrath	eb3b7904f0	Regenerated	1995-05-10 21:59:24 +00:00
Roland McGrath	bbfb270092	Regenerated for 3.73.3	1995-05-10 21:58:53 +00:00
Roland McGrath	c18253b59b	Updated from libc	1995-05-10 21:57:56 +00:00
Roland McGrath	41177916df	.	1995-05-10 21:46:30 +00:00
Roland McGrath	7acd99c5e6	AIX support from Tim Bell <tbel@afsmail.cern.ch>: [_AIX] (LOAD_AVE_TYPE, FSCALE, NLIST_STRUCT): Define these for AIX. (getloadavg) [_AIX]: Use `knlist' instead of `nlist'.	1995-05-10 15:03:48 +00:00
Roland McGrath	d6c62b351f	.	1995-05-09 22:51:11 +00:00
Roland McGrath	c9c43b0871	($(infodir)/make.info): Make sure $$dir is set in install-info cmd.	1995-05-09 21:14:48 +00:00
Roland McGrath	13e8568f03	(print_file): Grok update_status of 1 for -q.	1995-05-03 19:53:19 +00:00
Roland McGrath	cebdba9dfa	Move include of config.h before all others.	1995-04-29 19:47:58 +00:00
Roland McGrath	4ea152e71b	Regenerated	1995-04-27 16:57:09 +00:00
Roland McGrath	443f39f4f7	Regenerated for 3.73.2	1995-04-27 16:56:40 +00:00
Roland McGrath	675981bc4f	Updated from libc	1995-04-27 16:43:27 +00:00
Roland McGrath	11af972f87	.	1995-04-27 16:41:39 +00:00
Roland McGrath	d9c126da40	.	1995-04-27 16:41:12 +00:00
Roland McGrath	7170467928	.	1995-04-27 16:37:56 +00:00
Roland McGrath	81699266d3	(remove_intermediates): Fix inverted test to bail under -n for signal case. Bail under -q or -t. Skip files with update_status==-1.	1995-04-26 21:27:19 +00:00
Roland McGrath	cbdb3653da	[HAVE_UNISTD_H]: Include unistd.h so it can declare sys_siglist.	1995-04-26 21:19:26 +00:00
Roland McGrath	5d82479d89	(job_next_command): Skip empty lines. (new_job): Don't test the return of job_next_command. Just let start_waiting_job handle the case of empty commands.	1995-04-26 21:15:25 +00:00
Roland McGrath	ed0d607279	.	1995-04-19 22:20:52 +00:00
Roland McGrath	855bd6896d	[__MSDOS__]: Include <fcntl.h>. From DJ Delorie.	1995-04-19 18:09:30 +00:00
Roland McGrath	179ef370e8	Regenerated for 3.73.1	1995-04-19 07:29:56 +00:00
Roland McGrath	01dc9a22f9	Updated from libc	1995-04-19 07:28:27 +00:00
Roland McGrath	bc15ada5ed	.	1995-04-19 07:26:32 +00:00
Roland McGrath	fce5e4a9b9	.	1995-04-08 18:54:00 +00:00
Roland McGrath	07a45cd0af	(notice_finished_file): Set FILE->update_status to zero if it's -1.	1995-04-08 18:52:42 +00:00
Roland McGrath	226a132e31	(CPPFLAGS): Use $(defines) too.	1995-04-05 04:53:56 +00:00
Roland McGrath	b59f5f30b9	Regenerated for 3.73	1995-04-05 04:41:14 +00:00
Roland McGrath	acdd73ea34	.	1995-04-05 04:21:27 +00:00
Roland McGrath	38b5b27eb5	Add '95 to copyright years.	1995-04-05 03:32:21 +00:00
Roland McGrath	e8325b9be2	(Options/Recursion): Correction: -I is indeed passed in MAKEFLAGS.	1995-04-05 03:29:01 +00:00
Roland McGrath	f8eb0fc41b	.	1995-03-30 10:02:35 +00:00
Roland McGrath	ea38e1fe78	(main): Fixed braino in assert.	1995-03-28 18:59:57 +00:00
Roland McGrath	ed276c008d	Regenerated for 3.72.13	1995-03-28 18:28:18 +00:00
Roland McGrath	910d25619e	(CPPFLAGS): Use $(CPPFLAGS) instead of $(defines).	1995-03-28 18:24:20 +00:00
Roland McGrath	2ae5430550	Remade with Autoconf 2.3	1995-03-28 18:04:30 +00:00
Roland McGrath	e53ac8a6fc	.	1995-03-27 10:55:57 +00:00
Roland McGrath	cb51d55ab2	Avoid string in assert expression. Some systems are broken.	1995-03-27 10:28:35 +00:00
Roland McGrath	0b4723a689	.	1995-03-27 10:02:36 +00:00
Roland McGrath	3f9ce84b4a	Include <assert.h>.	1995-03-24 23:39:24 +00:00
Roland McGrath	bdbe8501c6	(main): Handle 1 and 2 returns from update_goal_chain makefile run properly.	1995-03-24 23:27:05 +00:00
Roland McGrath	3a12be3a73	autoheader	1995-03-24 07:30:46 +00:00
Roland McGrath	2346f99368	Regenerated for 3.72.12	1995-03-24 07:28:53 +00:00
Roland McGrath	d855846472	.	1995-03-24 07:27:44 +00:00
Roland McGrath	b9f7d21e42	Regenerated	1995-03-24 06:37:24 +00:00
Roland McGrath	db089ad3e3	.	1995-03-24 05:58:13 +00:00
Roland McGrath	1331cca1fa	(handle_non_switch_argument): New function, broken out of decode_switches. (decode_switches): Set optind to 0 to reinitialize getopt, not to 1. When getopt_long returns EOF, break the loop and handle remaining args with a simple second loop.	1995-03-24 05:56:41 +00:00
Roland McGrath	fe05aaf7f2	(update_file_1): Handle FILE->update_status == 2 in -d printout.	1995-03-24 05:40:22 +00:00
Roland McGrath	cc35ff7381	(remake_file): Set update_status to 2 instead of 1 for no rule to make. Mention parent (dependent) in error message.	1995-03-24 05:33:31 +00:00
Roland McGrath	a146085382	(start_job_command, reap_children): Set update_status to 2 instead of 1 for failed commands.	1995-03-24 05:32:12 +00:00
Roland McGrath	79fcb77ad1	(signame_init): Define SIGINFO.	1995-03-21 21:44:32 +00:00
Roland McGrath	3608635ec6	(search_path): Function removed (was already #if 0'd out).	1995-03-21 21:24:36 +00:00
Roland McGrath	ca53696814	Remove AC_TYPE_GETGROUPS; nothing needs it any more.	1995-03-21 21:23:26 +00:00
Roland McGrath	61dac07200	Updated from libc	1995-03-17 21:17:43 +00:00
Roland McGrath	9e42026e08	.	1995-03-17 21:16:34 +00:00
Roland McGrath	b52ea79ee6	Write @CPPFLAGS@ translation.	1995-03-17 20:57:17 +00:00
Roland McGrath	e483431569	.	1995-03-13 05:51:54 +00:00
Roland McGrath	28b622b8a1	(stamp-glob): Remove $(globfiles), not the whole glob directory.	1995-03-13 05:51:44 +00:00
Roland McGrath	cbfc50cb51	(parse_file_seq): Rearranged `l(a b)' ->` l(a) l(b)' loop to not skip the elt immediately preceding `l(...'.	1995-03-13 05:45:44 +00:00
Roland McGrath	deb7cced6e	Regenerated for 3.72.11	1995-03-10 20:36:06 +00:00
Roland McGrath	f9af56ac67	.	1995-03-10 20:36:06 +00:00
Roland McGrath	3ba2e947ac	Changed find_char_unquote callers here too.	1995-03-10 20:34:41 +00:00
Roland McGrath	13d0eeb8e5	(find_char_unquote): Make second arg a string of stop chars instead of a single stop char. Stop when any char in the string is hit. All callers changed. (find_semicolon): Pass stop chars "#;" to one find_char_unquote call, instead of using two calls. If the match is not a ; but a #, return zero.	1995-03-10 20:33:40 +00:00