Compile multiple source files when possible.

3 files changed, 18 insertions, 3 deletions

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index ab1729cfa8c..dff390ccb1f 100644
--- 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 ab1dd5b7fe9..77609f45bb9 100644
--- 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 df55ce3cb3a..c91b61886fd 100644
--- 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.