Rollback removal of auto-dependancy checking.

[reactos.git] / reactos / ntoskrnl / Makefile

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 399c319..d134a4e 100644 (file)
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.68 2002/05/05 14:57:42 chorns Exp $
+# $Id: Makefile,v 1.88 2002/12/09 15:18:11 robd Exp $
 #
 # ReactOS Operating System
 #
@@ -27,7 +27,7 @@ endif
 
 ifeq ($(KDBG), 1)
 OBJECTS_KDBG := dbg/kdb.o dbg/kdb_keyboard.o dbg/rdebug.o \
-                dbg/i386/kdb_help.o
+                dbg/i386/kdb_help.o dbg/kdb_stabs.o
 else
 OBJECTS_KDBG :=
 endif
@@ -55,7 +55,8 @@ all: \
        bugcodes.rc \
        $(TARGETNAME).nostrip.exe \
        $(TARGETNAME).exe \
-       $(TARGETNAME).sym 
+       $(TARGETNAME).sym \
+       ntoskrnl.map
 
 #
 # Architecture specific Makefile
@@ -82,7 +83,9 @@ OBJECTS_NT = \
 OBJECTS_RTL = \
        rtl/atom.o \
        rtl/bitmap.o \
+       rtl/compress.o \
        rtl/ctype.o \
+       rtl/dos8dot3.o \
        rtl/error.o \
        rtl/handle.o \
        rtl/largeint.o \
@@ -93,9 +96,9 @@ OBJECTS_RTL = \
        rtl/memset.o \
        rtl/message.o \
        rtl/nls.o \
+       rtl/purecall.o \
        rtl/qsort.o \
        rtl/regio.o \
-       rtl/seh.o \
        rtl/sprintf.o \
        rtl/stdlib.o \
        rtl/string.o \
@@ -107,6 +110,9 @@ OBJECTS_RTL = \
        rtl/memcmp.o \
        rtl/capture.o
 
+OBJECTS_RTL := $(filter-out $(RTL_EXCLUDE_FILTER), $(OBJECTS_RTL))
+
+
 # Kernel (Ke)
 OBJECTS_KE = \
        ke/apc.o \
@@ -131,6 +137,7 @@ OBJECTS_KE = \
 OBJECTS_MM = \
        mm/aspace.o \
        mm/cont.o \
+       mm/drvlck.o \
        mm/freelist.o \
        mm/iospace.o \
        mm/marea.o \
@@ -153,12 +160,14 @@ OBJECTS_MM = \
        mm/pageop.o \
        mm/balance.o \
        mm/rmap.o \
-       mm/slab.o
+       mm/slab.o \
+       mm/anonmem.o \
+       mm/region.o
 
 # I/O Subsystem (Io)
 OBJECTS_IO = \
        io/adapter.o \
-  io/arcname.o \
+       io/arcname.o \
        io/buildirp.o \
        io/cancel.o \
        io/cleanup.o \
@@ -166,7 +175,7 @@ OBJECTS_IO = \
        io/create.o \
        io/device.o \
        io/dir.o \
-       io/drvlck.o \
+       io/driver.o \
        io/errlog.o \
        io/error.o \
        io/event.o \
@@ -176,6 +185,7 @@ OBJECTS_IO = \
        io/iocomp.o \
        io/ioctrl.o \
        io/iomgr.o \
+       io/iowork.o \
        io/irp.o \
        io/lock.o \
        io/mailslot.o \
@@ -218,7 +228,8 @@ OBJECTS_PS = \
        ps/tinfo.o \
        ps/debug.o \
        ps/suspend.o \
-       ps/win32.o
+       ps/win32.o \
+       ps/w32call.o
 
 # Executive Subsystem (Ex)
 OBJECTS_EX = \
@@ -325,7 +336,7 @@ OBJECTS_KD = \
        kd/kdebug.o \
        kd/service.o \
        kd/dlog.o \
-  kd/gdbstub.o
+  kd/gdbstub.o kd/mda.o
 
 DEP_OBJECTS := $(OBJECTS_NT) $(OBJECTS_MM) $(OBJECTS_ARCH) \
        $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \
@@ -333,10 +344,12 @@ DEP_OBJECTS := $(OBJECTS_NT) $(OBJECTS_MM) $(OBJECTS_ARCH) \
        $(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \
        $(OBJECTS_PO) $(OBJECTS_KD) $(OBJECTS_RTL)
 
+TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(DEP_OBJECTS))))
 
 #
 # Include automatic dependancy tracking
 #
+DEP_EXCLUDE_FILTER := ex/napi.% nt/zw.%
 include $(PATH_TO_TOP)/tools/depend.mk
 
 
@@ -370,7 +383,7 @@ $(OBJECTS_PATH)/ke.o: $(OBJECTS_KE)
        $(LD) \
                -r \
                -o $(OBJECTS_PATH)/ke.o \
-               $(OBJECTS_KE) 
+               $(OBJECTS_KE)
 
 $(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL)
        $(LD) \
@@ -382,7 +395,7 @@ $(OBJECTS_PATH)/mm.o: $(OBJECTS_MM)
        $(LD) \
                -r \
                -o $(OBJECTS_PATH)/mm.o \
-               $(OBJECTS_MM) 
+               $(OBJECTS_MM)
 
 $(OBJECTS_PATH)/ob.o: $(OBJECTS_OB)
        $(LD) \
@@ -460,13 +473,13 @@ $(OBJECTS_PATH)/cc.o: $(OBJECTS_CC)
        $(LD) \
                -r \
                -o $(OBJECTS_PATH)/cc.o \
-               $(OBJECTS_CC) 
+               $(OBJECTS_CC)
 
 $(OBJECTS_PATH)/kd.o: $(OBJECTS_KD)
        $(LD) \
                -r \
                -o $(OBJECTS_PATH)/kd.o \
-               $(OBJECTS_KD) 
+               $(OBJECTS_KD)
 
 # Note: arch.o MUST be the first file!!!
 OBJECTS := \
@@ -491,12 +504,6 @@ OBJECTS := \
        $(OBJECTS_PATH)/se.o \
        $(OBJECTS_RESOURCE)
 
-CLEAN_FILES = $(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 \
-              rtl/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o nls/*.o \
-              lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \
-              $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym \
-                 $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES)
 
 $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
        $(CC) \
@@ -613,7 +620,13 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
        - $(RM) temp.exp
 
 $(TARGETNAME).sym: $(TARGETNAME).nostrip.exe
-       $(NM) --numeric-sort $(TARGETNAME).nostrip.exe > $(TARGETNAME).sym
+       $(RSYM) $(TARGETNAME).nostrip.exe $(TARGETNAME).sym
+
+TAGS: $(TAG_OBJECTS)
+       etags $(addprefix -i , $(TAG_OBJECTS))
+
+ntoskrnl.map: $(TARGETNAME).nostrip.exe
+       $(NM) --numeric-sort $(TARGETNAME).nostrip.exe > ntoskrnl.map
 
 $(TARGETNAME).o: $(OBJECTS)
        $(LD) \
@@ -627,17 +640,26 @@ bugcodes.rc: ntoskrnl.mc
                -o bugcodes.rc \
                $(TARGETNAME).mc
 
-implib:
+$(DDK_PATH_LIB)/$(TARGETNAME).a: $(TARGETNAME).def
        - $(DLLTOOL) \
                --dllname $(TARGETNAME).exe \
                --def $(TARGETNAME).def \
                --output-lib $(DDK_PATH_LIB)/$(TARGETNAME).a \
                --kill-at
 
-clean: 
-       - $(RM) $(CLEAN_FILES)
+implib: $(DDK_PATH_LIB)/$(TARGETNAME).a
 
-.PHONY: clean 
+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 \
+              rtl/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o nls/*.o \
+              lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \
+              $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \
+                 $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \
+             $(TAG_OBJECTS)
+
+
+.PHONY: clean
 
 install: all $(INSTALL_DIR)/system32/$(TARGETNAME).exe $(INSTALL_DIR)/symbols/$(TARGETNAME).sym
 
@@ -667,10 +689,22 @@ ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h
 %.o: %.S
        $(AS) $(ASFLAGS) -c $< -o $@
 %.o: %.s
-       $(AS) $(ASFLAGS) -c $< -o $@    
+       $(AS) $(ASFLAGS) -c $< -o $@
 %.o: %.asm
        $(NASM_CMD) $(NFLAGS) $< -o $@
 %.coff: %.rc
        $(RC) $(RCINC) $< -o $@
 
+#
+#
+#
+.%.TAG: %.S
+       etags -o $@ $<
+
+.%.TAG: %.s
+       etags -o $@ $<
+
+.%.TAG: %.c
+       etags -o $@ $^
+
 # EOF