Changeset 4777 for trunk/src

Timestamp:

Dec 11, 2000, 7:28:44 AM (25 years ago)

Author:

bird

Message:

Added new object files.
Corrected target/rules for generated source files.

File:

• trunk/src/win32k/win32k.mak (modified) (8 diffs)

trunk/src/win32k/win32k.mak

@@ -1 @@
-# $Id: win32k.mak,v 1.1 2000-12-02 23:32:38 bird Exp $
+# $Id: win32k.mak,v 1.2 2000-12-11 06:28:44 bird Exp $
 
 #
@@ -62 +62 @@
     $(WIN32KOBJ)\myldrOpenPath.obj \
     $(WIN32KOBJ)\myldrOpenPatha.obj \
+    $(WIN32KOBJ)\myldrFindModule.obj \
+    $(WIN32KOBJ)\myldrCheckInternalName.obj \
+    $(WIN32KOBJ)\myldrGetFileName.obj \
     $(WIN32KOBJ)\OS2KTCB.obj \
     $(WIN32KOBJ)\OS2KPTDA.obj \
@@ -103 +106 @@
                             $(LASTOBJ) \
                             $(LIBSINIT) \
+                            $(WIN32KOBJ)\$(@B).lnk \
                             win32k.mak makefile.inc ..\..\makefile.inc
     -@$(ECHO) recompiling d16globl to get correct build time and date:
@@ -108 +112 @@
         -Fa$(WIN32KLIST)\d16globl.s dev16\d16globl.c
     -@$(ECHO) linking: $@
-    -4 $(LD) $(LFLAGS) @<<$(WIN32KOBJ)\$(@B).lnk
-/OUT:$@
-/MAP:$(WIN32KBIN)\$(@B).map
+!ifdef GREP
+    -4 $(LD) $(LFLAGS) @$(WIN32KOBJ)\$(@B).lnk | $(GREP) -v LNK4001 | $(GREP) -v LNK4031
+!else
+    -4 $(LD) $(LFLAGS) @$(WIN32KOBJ)\$(@B).lnk
+!endif
+    cd $(WIN32KBIN)
+    @mapsym $(*B).map > nul
+    cd $(WIN32KBASE)
+    if not exist $(ODIN32_BIN) $(CREATEPATH) $(ODIN32_BIN)
+    $(CP) $@ $(ODIN32_BIN)
+    $(CP) $*.sym $(ODIN32_BIN)
+    $(CP) $(WIN32KBASE)\$(*B).ddp $(ODIN32_BIN)
+
+# Linker file.
+$(WIN32KOBJ)\$(NAME).lnk: win32k.mak makefile.inc ..\..\makefile.inc
+    echo @<<$(WIN32KOBJ)\$(NAME).lnk
+/OUT:$(WIN32KBIN)\$(NAME).sys
+/MAP:$(WIN32KBIN)\$(NAME).map
 $(OBJS:  =^
 )
@@ -119 +138 @@
 $(WIN32KOBJ)\$(NAME)new.def
 <<KEEP
-    cd $(WIN32KBIN)
-    @mapsym $(*B).map > nul
-    cd $(WIN32KBASE)
-    if not exist $(ODIN32_BIN) $(CREATEPATH) $(ODIN32_BIN)
-    $(CP) $@ $(ODIN32_BIN)
-    $(CP) $*.sym $(ODIN32_BIN)
-    $(CP) $(WIN32KBASE)\$(*B).ddp $(ODIN32_BIN)
 
 # Add bldlevel signature to win32k.def - creates temporary win32knew.def.
@@ -175 +187 @@
     $(WIN32KOBJ)\myldrOpenPath.obj \
     $(WIN32KOBJ)\myldrOpenPatha.obj \
+    $(WIN32KOBJ)\myldrFindModule.obj \
+    $(WIN32KOBJ)\myldrCheckInternalName.obj \
+    $(WIN32KOBJ)\myldrGetFileName.obj \
     $(WIN32KOBJ)\OS2KTCB.obj \
     $(WIN32KOBJ)\OS2KPTDA.obj \
@@ -304 +319 @@
 # Generate calltaba.asm
 #
-ldr\calltaba.asm: dev16\probkrnl.c $(WIN32KBIN)\mkcalltab.exe
+ldr\calltaba.asm \
+$(WIN32KBASE)\ldr\calltaba.asm : dev16\probkrnl.c $(WIN32KBIN)\mkcalltab.exe
     $(WIN32KBIN)\mkcalltab.exe calltab > $@
 
@@ -311 +327 @@
 # Generate TstFakers.c
 #
-test\TstFakers.c: dev16\probkrnl.c include\probkrnl.h $(WIN32KBIN)\mkcalltab.exe
+test\TstFakers.c \
+$(WIN32KBASE)\test\TstFakers.c: dev16\probkrnl.c include\probkrnl.h $(WIN32KBIN)\mkcalltab.exe
     $(WIN32KBIN)\mkcalltab.exe tstfakers > $@