Compile multiple source files when possible.

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index ab1729cfa8cbcc06ec15824a5a25df85d2f4b708..dff390ccb1f3647bbf275e71bee565eb72d01422 100644 (file)
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -217,8 +217,13 @@ $(DOC):            $(BLD)\make-docfile.exe
 {$(BLD)}.obj{$(BLD)}.exe:
                $(LINK) -out:$@ $(LINK_FLAGS) $*.obj $(LIBS)
 
+!IF ($(_NMAKE_VER) < $(_NMAKE_VER_5))
 .c{$(BLD)}.obj:
-               $(CC) $(CFLAGS) -Fo$@ $<
+               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
+!ELSE
+.c{$(BLD)}.obj::
+               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
+!ENDIF
 
 #
 # Build the executables

diff --git a/nt/makefile.nt b/nt/makefile.nt
index ab1dd5b7fe90422666547e3500ac28d9a02621d0..77609f45bb9653aca72b74b99aac25a0e4a327b1 100644 (file)
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -29,8 +29,13 @@ TRES         = $(BLD)\emacs.res
 TRES           = $(BLD)\emacs.rbj
 !endif
 
+!IF ($(_NMAKE_VER) < $(_NMAKE_VER_5))
 .c{$(BLD)}.obj:
-                 $(CC) $(CFLAGS) -Fo$@ $<
+               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
+!ELSE
+.c{$(BLD)}.obj::
+               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
+!ENDIF
 
 addpm:           $(BLD) $(BLD)\addpm.exe
 $(BLD)\addpm.obj: addpm.c

diff --git a/src/makefile.nt b/src/makefile.nt
index df55ce3cb3a2a0d310edafedc4bb0ceeabf562f1..c91b61886fd94e89697bae6a7d79cd10d5dace11 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -241,8 +241,13 @@ $(TLASTLIB):       $(BLD)\lastfile.obj
 #
 # Object files.
 #
+!IF ($(_NMAKE_VER) < $(_NMAKE_VER_5))
 .c{$(BLD)}.obj:
-               $(CC) $(CFLAGS) -Fo$@ $<
+               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
+!ELSE
+.c{$(BLD)}.obj::
+               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
+!ENDIF
 
 #
 # Assuming INSTALL_DIR is defined, build and install emacs in it.