changeset 23626:9e10a92252d9

Compile multiple source files when possible.
author Geoff Voelker <voelker@cs.washington.edu>
date Wed, 04 Nov 1998 01:28:57 +0000
parents f91f7d21d4ec
children 3905e071bd2d
files lib-src/makefile.nt nt/makefile.nt src/makefile.nt
diffstat 3 files changed, 18 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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.