2003-08-11 Casper S. Hornstrup <chorns@users.sourceforge.net>

[reactos.git] / reactos / ntoskrnl / Makefile

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 6ba3c50..3b6b602 100644 (file)
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.99 2003/06/11 12:29:49 ekohl Exp $
+# $Id: Makefile,v 1.104 2003/08/11 18:50:12 chorns Exp $
 #
 # ReactOS Operating System
 #
@@ -40,6 +40,12 @@ ASFLAGS += -I./include -I$(SDK_PATH_INC)
 CFLAGS += -I./include -I$(SDK_PATH_INC) -D__NTOSKRNL__ $(CFLAGS_DBG) -Wall -Werror
 endif
 
+# ASFLAGS += -D__USE_W32API -D_NTOSKRNL_
+# CFLAGS += -D__USE_W32API -D_NTOSKRNL_
+
+# require os code to explicitly request A/W version of structs/functions
+CFLAGS += -D_DISABLE_TIDENTS
+
 #
 # Build configuration
 #
@@ -93,7 +99,6 @@ OBJECTS_RTL = \
        rtl/message.o \
        rtl/nls.o \
        rtl/purecall.o \
-       rtl/qsort.o \
        rtl/random.o \
        rtl/regio.o \
        rtl/sprintf.o \
@@ -267,6 +272,7 @@ OBJECTS_FS = \
 OBJECTS_SE = \
        se/access.o \
        se/acl.o \
+       se/audit.o \
        se/lsa.o \
        se/luid.o \
        se/priv.o \
@@ -334,6 +340,11 @@ OBJECTS_KD = \
     kd/gdbstub.o \
     kd/mda.o
 
+# Boot video (Inbv)
+OBJECTS_INBV = \
+       inbv/inbv.o \
+       inbv/bootvid.o
+
 DEP_OBJECTS := $(OBJECTS_NT) $(OBJECTS_MM) $(OBJECTS_ARCH) \
        $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \
        $(OBJECTS_PS) $(OBJECTS_EX) $(OBJECTS_CC) $(OBJECTS_FS) $(OBJECTS_SE) \
@@ -471,6 +482,12 @@ $(OBJECTS_PATH)/kd.o: $(OBJECTS_KD)
                -o $(OBJECTS_PATH)/kd.o \
                $(OBJECTS_KD)
 
+$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV)
+       $(LD) \
+               -r \
+               -o $(OBJECTS_PATH)/inbv.o \
+               $(OBJECTS_INBV)
+
 # Note: arch.o MUST be the first file!!!
 OBJECTS := \
        $(OBJECTS_PATH)/arch.o \
@@ -491,10 +508,11 @@ OBJECTS := \
        $(OBJECTS_PATH)/ps.o \
        $(OBJECTS_PATH)/rtl.o \
        $(OBJECTS_PATH)/se.o \
+       $(OBJECTS_PATH)/inbv.o \
        $(OBJECTS_RESOURCE)
 
 
-$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a  
+$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a 
        $(CC) \
                -Wl,-T,ntoskrnl.lnk \
                -nostartfiles \
@@ -509,6 +527,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).o -lgcc \
                $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
                $(DDK_PATH_LIB)/hal.a
        - $(RM) junk.tmp
        $(DLLTOOL) \
@@ -532,10 +551,11 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a
                -Wl,temp.exp \
                $(TARGETNAME).o -lgcc \
                $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
                $(DDK_PATH_LIB)/hal.a
        - $(RM) temp.exp
 
-$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a
+$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
        - $(CC) \
                -Wl,-T,$(LINKER_SCRIPT) \
                -nostartfiles \
@@ -550,6 +570,7 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).o -lgcc \
                $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
                $(DDK_PATH_LIB)/hal.a
        - $(RM) junk.tmp
        $(DLLTOOL) \
@@ -573,13 +594,14 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_
                -Wl,temp.exp \
                $(TARGETNAME).o -lgcc \
                $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
                $(DDK_PATH_LIB)/hal.a
        - $(RM) temp.exp
 
 $(TARGETNAME).dbg.o: $(TARGETNAME).o
        $(STRIP) --strip-debug -o $(TARGETNAME).dbg.o $(TARGETNAME).o
 
-$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a
+$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
        $(CC) \
                -Wl,-T,$(TARGETNAME).dbg.lnk \
                -nostartfiles \
@@ -594,6 +616,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(D
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).dbg.o -lgcc \
                $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
                $(DDK_PATH_LIB)/hal.a
        - $(RM) junk.tmp
        $(DLLTOOL) \
@@ -617,6 +640,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(D
                -Wl,temp.exp \
                $(TARGETNAME).dbg.o -lgcc \
                $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
                $(DDK_PATH_LIB)/hal.a
        - $(RM) temp.exp
 
@@ -652,7 +676,7 @@ implib: $(DDK_PATH_LIB)/$(TARGETNAME).a
 
 clean:
        - $(RM) $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o \
-              ex/i386/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o \
+              ex/i386/*.o inbv/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o \
               rtl/*.o rtl/i386/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o \
               lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \
               $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \