# HG changeset patch # User Geoff Voelker # Date 910142937 0 # Node ID 9e10a92252d9f572f52a1b58b64fa33ccbe61c3d # Parent f91f7d21d4ece649cbdf3e9e82402ff727da9a3e Compile multiple source files when possible. diff -r f91f7d21d4ec -r 9e10a92252d9 lib-src/makefile.nt --- a/lib-src/makefile.nt Wed Nov 04 01:28:04 1998 +0000 +++ b/lib-src/makefile.nt Wed Nov 04 01:28:57 1998 +0000 @@ -217,8 +217,13 @@ {$(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 -r f91f7d21d4ec -r 9e10a92252d9 nt/makefile.nt --- a/nt/makefile.nt Wed Nov 04 01:28:04 1998 +0000 +++ b/nt/makefile.nt Wed Nov 04 01:28:57 1998 +0000 @@ -29,8 +29,13 @@ 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 -r f91f7d21d4ec -r 9e10a92252d9 src/makefile.nt --- a/src/makefile.nt Wed Nov 04 01:28:04 1998 +0000 +++ b/src/makefile.nt Wed Nov 04 01:28:57 1998 +0000 @@ -241,8 +241,13 @@ # # 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.