Regenerated

2 files changed, 16 insertions, 27 deletions

diff --git a/Makefile.in b/Makefile.in
index d35c55a..8db3f1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
 # NOTE: If you have no `make' program at all to process this makefile, run
 # `build.sh' instead.
 #
-# Copyright (C) 1988, 89, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1988,89,91,92,93,94,95,96 Free Software Foundation, Inc.
 # This file is part of GNU Make.
-# 
+#
 # GNU Make is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
@@ -13,7 +13,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Make; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -48,19 +48,6 @@ defines = @DEFS@ -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
 # The code is found in `remote-$(REMOTE).c'.
 REMOTE = @REMOTE@
 
-# If you are using the GNU C library, or have the GNU getopt functions in
-# your C library, you can comment these out.
-GETOPT = getopt.o getopt1.o
-GETOPT_SRC = $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/getopt.h
-
-# If you are using the GNU C library, or have the GNU glob functions in
-# your C library, you can comment this out.  GNU make uses special hooks
-# into the glob functions to be more efficient (by using make's directory
-# cache for globbing), so you must use the GNU functions even if your
-# system's C library has the 1003.2 glob functions already.  Also, the glob
-# functions in the AIX and HPUX C libraries are said to be buggy.
-GLOB = glob/libglob.a
-
 # If your system doesn't have alloca, or the one provided is bad, define this.
 ALLOCA = @ALLOCA@
 ALLOCA_SRC = $(srcdir)/alloca.c
@@ -123,7 +110,8 @@ CTAGS = ctags -w
 objs = commands.o job.o dir.o file.o misc.o main.o read.o remake.o	\
        rule.o implicit.o default.o variable.o expand.o function.o	\
        vpath.o version.o ar.o arscan.o signame.o remote-$(REMOTE).o	\
-       $(GLOB) $(GETOPT) $(ALLOCA) $(extras)
+       getopt.o getopt1.o glob/libglob.a				\
+       $(ALLOCA) $(extras)
 srcs = $(srcdir)/commands.c $(srcdir)/job.c $(srcdir)/dir.c		\
        $(srcdir)/file.c $(srcdir)/getloadavg.c $(srcdir)/misc.c		\
        $(srcdir)/main.c $(srcdir)/read.c $(srcdir)/remake.c		\
@@ -132,7 +120,7 @@ srcs = $(srcdir)/commands.c $(srcdir)/job.c $(srcdir)/dir.c		\
        $(srcdir)/vpath.c $(srcdir)/version.c				\
        $(srcdir)/remote-$(REMOTE).c					\
        $(srcdir)/ar.c $(srcdir)/arscan.c				\
-       $(srcdir)/signame.c $(srcdir)/signame.h $(GETOPT_SRC)		\
+       $(srcdir)/signame.c $(srcdir)/signame.h getopt.c getopt1.c	\
        $(srcdir)/commands.h $(srcdir)/dep.h $(srcdir)/file.h		\
        $(srcdir)/job.h $(srcdir)/make.h $(srcdir)/rule.h		\
        $(srcdir)/variable.h $(ALLOCA_SRC) $(srcdir)/config.h.in
@@ -287,21 +275,22 @@ 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
 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
+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
 remake.o: remake.c make.h commands.h job.h dep.h file.h
-rule.o : rule.c make.h config.h commands.h dep.h file.h variable.h rule.h 
-implicit.o : implicit.c make.h rule.h dep.h file.h 
+rule.o: rule.c make.h commands.h dep.h file.h variable.h rule.h
+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 
+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
 vpath.o: vpath.c make.h file.h variable.h
 version.o: version.c
-ar.o : ar.c make.h file.h dep.h 
+ar.o: ar.c make.h file.h dep.h
 arscan.o: arscan.c make.h
 signame.o: signame.c signame.h
-remote-stub.o : remote-stub.c make.h commands.h 
-getopt.o: getopt.c getopt.h
-getopt1.o : getopt1.c getopt.h 
+remote-stub.o: remote-stub.c make.h commands.h
+getopt.o: getopt.c
+getopt1.o: getopt1.c getopt.h
 getloadavg.o: getloadavg.c
diff --git a/build.sh.in b/build.sh.in
index 1667f0e..d3a46c4 100644
--- a/build.sh.in
+++ b/build.sh.in
@@ -45,7 +45,7 @@ includedir=${prefix}/include
 set -e
 
 # These are all the objects we need to link together.
-objs="commands.o job.o dir.o file.o misc.o main.o read.o remake.o rule.o implicit.o default.o variable.o expand.o function.o vpath.o version.o ar.o arscan.o signame.o getopt.o getopt1.o glob/glob.o glob/fnmatch.o remote-${REMOTE}.o ${extras} ${ALLOCA}"
+objs="commands.o job.o dir.o file.o misc.o main.o read.o remake.o rule.o implicit.o default.o variable.o expand.o function.o vpath.o version.o ar.o arscan.o signame.o getopt.o getopt1.o glob/libglob.a glob/glob.o glob/fnmatch.o remote-${REMOTE}.o ${extras} ${ALLOCA}"
 
 # Compile the source files into those objects.
 for file in `echo ${objs} | sed 's/\.o/.c/g'`; do