Rollback removal of auto-dependancy checking.

[reactos.git] / reactos / ntoskrnl / Makefile

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 8bcc865..d134a4e 100644 (file)
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.82 2002/09/07 16:44:12 chorns Exp $
+# $Id: Makefile,v 1.88 2002/12/09 15:18:11 robd Exp $
 #
 # ReactOS Operating System
 #
@@ -34,10 +34,10 @@ endif
 
 ifeq ($(strip $(SDK_PATH_INC)),)
 ASFLAGS += -I./include
-CFLAGS += -I./include -D_NTOSKRNL_ $(CFLAGS_DBG) -Wall -Werror
+CFLAGS += -I./include -D__NTOSKRNL__ $(CFLAGS_DBG) -Wall -Werror
 else
 ASFLAGS += -I./include -I$(SDK_PATH_INC)
-CFLAGS += -I./include -I$(SDK_PATH_INC) -D_NTOSKRNL_ $(CFLAGS_DBG) -Wall -Werror
+CFLAGS += -I./include -I$(SDK_PATH_INC) -D__NTOSKRNL__ $(CFLAGS_DBG) -Wall -Werror
 endif
 
 #
@@ -99,7 +99,6 @@ OBJECTS_RTL = \
        rtl/purecall.o \
        rtl/qsort.o \
        rtl/regio.o \
-       rtl/seh.o \
        rtl/sprintf.o \
        rtl/stdlib.o \
        rtl/string.o \
@@ -186,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 \
@@ -350,8 +350,7 @@ TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(D
 # Include automatic dependancy tracking
 #
 DEP_EXCLUDE_FILTER := ex/napi.% nt/zw.%
-# FIXME: Disabled
-#include $(PATH_TO_TOP)/tools/depend.mk
+include $(PATH_TO_TOP)/tools/depend.mk
 
 
 # Resources
@@ -505,17 +504,10 @@ 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 ntoskrnl.map \
-                 $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \
-             $(TAG_OBJECTS)
 
 $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
        $(CC) \
-               -g -Wl,-T,ntoskrnl.lnk \
+               -Wl,-T,ntoskrnl.lnk \
                -nostartfiles \
                -nostdlib \
                -mdll \
@@ -536,7 +528,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
                --kill-at
        - $(RM) base.tmp
        $(CC) \
-               -g -nostartfiles \
+               -nostartfiles \
                -nostdlib \
                -Wl,-T,ntoskrnl.lnk \
                -mdll \
@@ -658,7 +650,14 @@ $(DDK_PATH_LIB)/$(TARGETNAME).a: $(TARGETNAME).def
 implib: $(DDK_PATH_LIB)/$(TARGETNAME).a
 
 clean:
-       - $(RM) $(CLEAN_FILES)
+       - $(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