Changeset 6726 for trunk/src

Timestamp:

Sep 16, 2001, 5:39:07 AM (24 years ago)

Author:

bird

Message:

Extract and d32init splittup.

File:

• trunk/src/win32k/kKrnlLib/Makefile (modified) (6 diffs)

trunk/src/win32k/kKrnlLib/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.2 2001-09-14 01:50:08 bird Exp $
+# $Id: Makefile,v 1.3 2001-09-16 03:39:07 bird Exp $
 
 #
@@ -43 +43 @@
     $(WIN32KOBJ)\d16globl.obj \
     $(WIN32KOBJ)\calltaba.obj \
+    $(WIN32KOBJ)\krnlInit.obj \
+    $(WIN32KOBJ)\krnlPrologs.obj \
+    $(WIN32KOBJ)\krnlStubs.obj \
+#    $(WIN32KOBJ)\krnlImports.obj \
     $(WIN32KOBJ)\asmutils.obj \
     $(WIN32KOBJ)\kAssert.obj \
@@ -286 +290 @@
 
 # List of object files in the converted crt library.
-CLIBOBJS =  +$(WIN32KOBJ)\inp.obj       +$(WIN32KOBJ)\outp.obj \
-            +$(WIN32KOBJ)\anfalmul.obj  +$(WIN32KOBJ)\anfaldiv.obj \
-            +$(WIN32KOBJ)\anfalrem.obj  +$(WIN32KOBJ)\anfauldi.obj \
-            +$(WIN32KOBJ)\anuldiv.obj   +$(WIN32KOBJ)\fmemcpy.obj \
-            +$(WIN32KOBJ)\anulrem.obj   +$(WIN32KOBJ)\anlmul.obj \
-            +$(WIN32KOBJ)\__AHINCR.obj  +$(WIN32KOBJ)\anlshl.obj
+CLIBOBJS =  +$(WIN32KOBJ)\..\inp.obj       +$(WIN32KOBJ)\..\outp.obj \
+            +$(WIN32KOBJ)\..\anfalmul.obj  +$(WIN32KOBJ)\..\anfaldiv.obj \
+            +$(WIN32KOBJ)\..\anfalrem.obj  +$(WIN32KOBJ)\..\anfauldi.obj \
+            +$(WIN32KOBJ)\..\anuldiv.obj   +$(WIN32KOBJ)\..\fmemcpy.obj \
+            +$(WIN32KOBJ)\..\anulrem.obj   +$(WIN32KOBJ)\..\anlmul.obj \
+            +$(WIN32KOBJ)\..\__AHINCR.obj  +$(WIN32KOBJ)\..\anlshl.obj
 
 # Make corrected crt library with only the required object files.
@@ -297 +301 @@
     @$(RM) $@
     @cd $(WIN32KOBJ)
-    $(DDKPATH)\tools\lib /nologo $@ $(CLIBOBJS);
+    $(DDKPATH)\tools\lib /nologo $@ @<<
+$(CLIBOBJS);
+<<
     @cd $(MAKEDIR)
 
@@ -385 +391 @@
 <<keep
 
-# Interference rule to make the MkCallTab objects.
+# Inference rule to make the MkCallTab objects.
 {dev16}.c.obj_c:
     @$(ECHO) compiling 16bit (mkcalltab): $<
@@ -408 +414 @@
 # Extract object files.
 EXTRACTOBJS = \
-    $(WIN32KOBJ)\extract.obj_e \
-    $(WIN32KOBJ)\probkrnl.obj_e \
-    $(WIN32KOBJ)\d16globl.obj_e \
+    $(WIN32KOBJ)\Extract.obj_e \
+    $(WIN32KOBJ)\Extract32.obj \
+    $(WIN32KOBJ)\krnlPrologs.obj \
+    $(WIN32KOBJ)\ProbKrnl.obj_e \
+    $(WIN32KOBJ)\d16Globl.obj_e \
     $(WIN32KOBJ)\vprntf16.obj_e
 
 # Rules to build Extract.exe.
-$(WIN32KBIN)\extract.exe: $(WIN32KBIN)\clfix.exe $(EXTRACTOBJS)
+$(WIN32KBIN)\Extract.exe: $(WIN32KBIN)\clfix.exe $(EXTRACTOBJS) Extract.def Makefile
     $(LD) $(LFLAGS) /pmtype:vio @<<$(WIN32KOBJ)\$(@B).lnk
         /OUT:$@
         /MAP:$(WIN32KBIN)\$(@B).map
+        Extract.def
         $(EXTRACTOBJS)
         $(TOOLKIT)\lib\os2286.lib
         $(MSCPATH)\lib\clibcep.lib
+        $(VACPATH)\lib\$(RTLLIB_NRE)
+        $(DDKPATH)\lib\os2386.lib
 <<keep
 
 # Copy rule.
-extract.exe: $(WIN32KBIN)\extract.exe
+Extract.exe: $(WIN32KBIN)\Extract.exe
     $(CP) $** $@
 
-# Interference rule to make the Extract objects.
+# Inference rule to make the Extract objects.
 {dev16}.c.obj_e:
     @$(ECHO) compiling 16bit (extract): $<
-    @$(CC16) -c -W3 -Asfw -G2s -Zp -Zl -nologo -Fa -Zi -Od -Lp -DDEBUG -DEXTRACT \
+    @$(CC16) -c -W3 -Asfw -G2s -Zp -Zl -nologo -Zi -Od -Lp -DDEBUG -DEXTRACT \
         -Fa$(WIN32KLIST)\$(*B)_e.s -Fo$(WIN32KOBJ)\$(@B).obj_e $(CINCLUDES16) $<
+
+{dev32}.c.obj_e:
+    @$(ECHO) compiling 32bit (extract): $<
+    $(CC) -c $(CFLAGS) -Gr -Rn -Ti- -ndBIG_ $(CDEFINES) $(CINCLUDES) -Fa$(WIN32KLIST)\$(@B)_e.s \
+        -Fo$(WIN32KOBJ)\$(@F) $<