Add hash.c etc. to various non-UNIX makefiles.

diff --git a/ChangeLog b/ChangeLog
index 1f4c0586233c406dac9c858ab314c2da44d116cc..326a4a860029fb43473b536a16eac92ac1db6726 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-16  Paul D. Smith  <psmith@gnu.org>
+
+       * NMakefile.template (OBJS): Add hash.c object file.
+       * SMakefile.template (srcs): Ditto.
+       * Makefile.ami (objs): Ditto.
+       * build_w32.bat: Ditto.
+
+       * Makefile.DOS.template: Remove extra dependencies.
+
 2002-10-25  Paul D. Smith  <psmith@gnu.org>
 
        * expand.c (install_variable_buffer): New function.  Install a new
@@ -30,6 +39,9 @@
 
 2002-10-14  Paul D. Smith  <psmith@gnu.org>
 
+       * remake.c (notice_finished_file): Only touch targets if they have
+       at least one command (as per POSIX).  Resolve Bug #1418.
+
        * *.c: Convert to using ANSI C-style function definitions.
        * Makefile.am: Enable the ansi2knr feature of automake.
        * configure.in: ditto.

diff --git a/Makefile.DOS.template b/Makefile.DOS.template
index 2f9eff59196d8c91b4ebd17676182463b216c57d..a5a864775222ecece4cf118a46c5b8360da55ac8 100644 (file)
--- a/Makefile.DOS.template
+++ b/Makefile.DOS.template
@@ -531,38 +531,3 @@ check-regression:
 .NOEXPORT:
 
 # --------------- DEPENDENCIES
-ar.o: ar.c make.h config.h gettext.h filedef.h dep.h glob/fnmatch.h
-arscan.o: arscan.c make.h config.h gettext.h
-commands.o: commands.c make.h config.h gettext.h dep.h filedef.h \
-       variable.h job.h commands.h
-default.o: default.c make.h config.h gettext.h rule.h dep.h filedef.h \
-       job.h commands.h variable.h
-dir.o: dir.c make.h config.h gettext.h glob/glob.h
-expand.o: expand.c make.h config.h gettext.h filedef.h job.h commands.h \
-       variable.h rule.h
-file.o: file.c make.h config.h gettext.h dep.h filedef.h job.h \
-       commands.h variable.h debug.h
-function.o: function.c make.h config.h gettext.h filedef.h variable.h \
-       dep.h job.h commands.h debug.h
-getopt.o: getopt.c config.h gettext.h getopt.h
-getopt1.o: getopt1.c config.h getopt.h
-implicit.o: implicit.c make.h config.h gettext.h rule.h dep.h filedef.h \
-       debug.h
-job.o: job.c make.h config.h gettext.h job.h debug.h filedef.h \
-       commands.h variable.h
-main.o: main.c make.h config.h gettext.h dep.h filedef.h variable.h \
-       job.h commands.h rule.h debug.h getopt.h
-misc.o: misc.c make.h config.h gettext.h dep.h debug.h
-read.o: read.c make.h config.h gettext.h glob/glob.h dep.h filedef.h \
-       job.h commands.h variable.h rule.h debug.h
-remake.o: remake.c make.h config.h gettext.h filedef.h job.h commands.h \
-       dep.h variable.h debug.h
-remote-stub.o: remote-stub.c make.h config.h gettext.h filedef.h job.h \
-       commands.h
-rule.o: rule.c make.h config.h gettext.h dep.h filedef.h job.h \
-       commands.h variable.h rule.h
-signame.o: signame.c make.h config.h gettext.h
-variable.o: variable.c make.h config.h gettext.h dep.h filedef.h job.h \
-       commands.h variable.h rule.h
-version.o: version.c config.h
-vpath.o: vpath.c make.h config.h gettext.h filedef.h variable.h

diff --git a/Makefile.ami b/Makefile.ami
index 8a71d690d6444d2be76ec41f7694787c8477fb06..6a2a2bc12a27b6608231ca47da8090be499401d0 100644 (file)
--- a/Makefile.ami
+++ b/Makefile.ami
@@ -119,14 +119,14 @@ 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     \
-       $(GETOPT) $(ALLOCA) $(extras)
+       vpath.o version.o ar.o arscan.o signame.o hash.o                 \
+       remote-$(REMOTE).o $(GETOPT) $(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             \
        $(srcdir)rule.c $(srcdir)implicit.c $(srcdir)default.c        \
        $(srcdir)variable.c $(srcdir)expand.c $(srcdir)function.c     \
-       $(srcdir)vpath.c $(srcdir)version.c                            \
+       $(srcdir)vpath.c $(srcdir)version.c $(srcdir)hash.c           \
        $(srcdir)remote-$(REMOTE).c                                     \
        $(srcdir)ar.c $(srcdir)arscan.c                                \
        $(srcdir)signame.c $(srcdir)signame.h $(GETOPT_SRC)            \

diff --git a/NMakefile.template b/NMakefile.template
index fb799e091968de3c598769e8089123428b4b224c..6fe527660815d321bcf5f70a9d8712112b7e8b98 100644 (file)
--- a/NMakefile.template
+++ b/NMakefile.template
@@ -88,6 +88,7 @@ OBJS = \
        $(OUTDIR)/getloadavg.obj \
        $(OUTDIR)/getopt.obj \
        $(OUTDIR)/getopt1.obj \
+       $(OUTDIR)/hash.obj \
        $(OUTDIR)/implicit.obj \
        $(OUTDIR)/job.obj \
        $(OUTDIR)/main.obj \

diff --git a/SMakefile.template b/SMakefile.template
index 5850abedbb242fb9ac55c2e4ecaf020aa3b6407c..64c0685306ee68d1c0a931d0987f591bab1b7066 100644 (file)
--- a/SMakefile.template
+++ b/SMakefile.template
@@ -125,14 +125,14 @@ 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)
+       vpath.o version.o ar.o arscan.o signame.o hash.o                 \
+       remote-$(REMOTE).o $(GLOB) $(GETOPT) $(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             \
        $(srcdir)rule.c $(srcdir)implicit.c $(srcdir)default.c        \
        $(srcdir)variable.c $(srcdir)expand.c $(srcdir)function.c     \
-       $(srcdir)vpath.c $(srcdir)version.c                            \
+       $(srcdir)vpath.c $(srcdir)version.c $(srcdir)hash.c           \
        $(srcdir)remote-$(REMOTE).c                                     \
        $(srcdir)ar.c $(srcdir)arscan.c                                \
        $(srcdir)signame.c $(srcdir)signame.h $(GETOPT_SRC)            \

diff --git a/build_w32.bat b/build_w32.bat
index 559fe8d36de3a0b592ec7eb379cdc1b170bc20b4..431bcef35ec80633183114dc889b762579f990af 100644 (file)
--- a/build_w32.bat
+++ b/build_w32.bat
@@ -45,6 +45,8 @@ cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D
 echo WinDebug\getopt.obj >>link.dbg\r
 cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c arscan.c\r
 echo WinDebug\arscan.obj >>link.dbg\r
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c hash.c\r
+echo WinDebug\hash.obj >>link.dbg\r
 cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c remake.c\r
 echo WinDebug\remake.obj >>link.dbg\r
 cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c misc.c\r
@@ -67,7 +69,7 @@ cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D
 echo WinDebug\pathstuff.obj >>link.dbg\r
 echo off\r
 echo "Linking WinDebug/%make%.exe"\r
-rem link.exe kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib w32\subproc\windebug\subproc.lib /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes /PDB:.\WinDebug/%make%.pdb /DEBUG /MACHINE:I386 /OUT:.\WinDebug/%make%.exe .\WinDebug/variable.obj  .\WinDebug/rule.obj  .\WinDebug/remote-stub.obj  .\WinDebug/commands.obj  .\WinDebug/file.obj  .\WinDebug/getloadavg.obj  .\WinDebug/default.obj  .\WinDebug/signame.obj  .\WinDebug/expand.obj  .\WinDebug/dir.obj  .\WinDebug/main.obj  .\WinDebug/getopt1.obj  .\WinDebug/job.obj  .\WinDebug/read.obj  .\WinDebug/version.obj  .\WinDebug/getopt.obj  .\WinDebug/arscan.obj  .\WinDebug/remake.obj  .\WinDebug/misc.obj  .\WinDebug/ar.obj  .\WinDebug/function.obj  .\WinDebug/vpath.obj  .\WinDebug/implicit.obj  .\WinDebug/dirent.obj  .\WinDebug/glob.obj  .\WinDebug/fnmatch.obj  .\WinDebug/pathstuff.obj\r
+rem link.exe kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib w32\subproc\windebug\subproc.lib /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes /PDB:.\WinDebug/%make%.pdb /DEBUG /MACHINE:I386 /OUT:.\WinDebug/%make%.exe .\WinDebug/variable.obj  .\WinDebug/rule.obj  .\WinDebug/remote-stub.obj  .\WinDebug/commands.obj  .\WinDebug/file.obj  .\WinDebug/getloadavg.obj  .\WinDebug/default.obj  .\WinDebug/signame.obj  .\WinDebug/expand.obj  .\WinDebug/dir.obj  .\WinDebug/main.obj  .\WinDebug/getopt1.obj  .\WinDebug/job.obj  .\WinDebug/read.obj  .\WinDebug/version.obj  .\WinDebug/getopt.obj  .\WinDebug/arscan.obj  .\WinDebug/remake.obj  .\WinDebug/hash.obj  .\WinDebug/misc.obj  .\WinDebug/ar.obj  .\WinDebug/function.obj  .\WinDebug/vpath.obj  .\WinDebug/implicit.obj  .\WinDebug/dirent.obj  .\WinDebug/glob.obj  .\WinDebug/fnmatch.obj  .\WinDebug/pathstuff.obj\r
 echo kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib w32\subproc\windebug\subproc.lib >>link.dbg\r
 link.exe /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes /PDB:.\WinDebug/%make%.pdb /DEBUG /MACHINE:I386 /OUT:.\WinDebug/%make%.exe @link.dbg\r
 if not exist .\WinDebug/%make%.exe echo "WinDebug build failed"\r
@@ -110,6 +112,8 @@ cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WIND
 echo WinRel\arscan.obj >>link.rel\r
 cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c remake.c\r
 echo WinRel\remake.obj >>link.rel\r
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c hash.c\r
+echo WinRel\hash.obj >>link.rel\r
 cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c misc.c\r
 echo WinRel\misc.obj >>link.rel\r
 cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c ar.c\r
@@ -130,7 +134,7 @@ cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WIND
 echo WinRel\pathstuff.obj >>link.rel\r
 echo off\r
 echo "Linking WinRel/%make%.exe"\r
-rem link.exe kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib w32\subproc\winrel\subproc.lib /NOLOGO /SUBSYSTEM:console /INCREMENTAL:no /PDB:.\WinRel/%make%.pdb /MACHINE:I386 /OUT:.\WinRel/%make%.exe .\WinRel/variable.obj  .\WinRel/rule.obj  .\WinRel/remote-stub.obj  .\WinRel/commands.obj  .\WinRel/file.obj  .\WinRel/getloadavg.obj  .\WinRel/default.obj  .\WinRel/signame.obj  .\WinRel/expand.obj  .\WinRel/dir.obj  .\WinRel/main.obj  .\WinRel/getopt1.obj  .\WinRel/job.obj  .\WinRel/read.obj  .\WinRel/version.obj  .\WinRel/getopt.obj  .\WinRel/arscan.obj  .\WinRel/remake.obj  .\WinRel/misc.obj  .\WinRel/ar.obj  .\WinRel/function.obj  .\WinRel/vpath.obj  .\WinRel/implicit.obj  .\WinRel/dirent.obj  .\WinRel/glob.obj  .\WinRel/fnmatch.obj  .\WinRel/pathstuff.obj\r
+rem link.exe kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib w32\subproc\winrel\subproc.lib /NOLOGO /SUBSYSTEM:console /INCREMENTAL:no /PDB:.\WinRel/%make%.pdb /MACHINE:I386 /OUT:.\WinRel/%make%.exe .\WinRel/variable.obj  .\WinRel/rule.obj  .\WinRel/remote-stub.obj  .\WinRel/commands.obj  .\WinRel/file.obj  .\WinRel/getloadavg.obj  .\WinRel/default.obj  .\WinRel/signame.obj  .\WinRel/expand.obj  .\WinRel/dir.obj  .\WinRel/main.obj  .\WinRel/getopt1.obj  .\WinRel/job.obj  .\WinRel/read.obj  .\WinRel/version.obj  .\WinRel/getopt.obj  .\WinRel/arscan.obj  .\WinRel/remake.obj  .\WinRel/misc.obj  .\WinRel/hash.obj  .\WinRel/ar.obj  .\WinRel/function.obj  .\WinRel/vpath.obj  .\WinRel/implicit.obj  .\WinRel/dirent.obj  .\WinRel/glob.obj  .\WinRel/fnmatch.obj  .\WinRel/pathstuff.obj\r
 echo kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib w32\subproc\winrel\subproc.lib >>link.rel\r
 link.exe /NOLOGO /SUBSYSTEM:console /INCREMENTAL:no /PDB:.\WinRel/%make%.pdb /MACHINE:I386 /OUT:.\WinRel/%make%.exe @link.rel\r
 if not exist .\WinRel/%make%.exe echo "WinRel build failed"\r