2003-08-11 Casper S. Hornstrup <chorns@users.sourceforge.net>
[reactos.git] / reactos / ntoskrnl / Makefile
index 81b6849..3b6b602 100644 (file)
@@ -1,30 +1,77 @@
-# $Id: Makefile,v 1.9 2001/03/06 14:41:18 dwelch Exp $
+# $Id: Makefile,v 1.104 2003/08/11 18:50:12 chorns Exp $
 #
 # ReactOS Operating System
 #
-PATH_TO_TOP = ..
 
-TARGETNAME = ntoskrnl
+#
+# Path to the directory containing the root makefile
+#
+PATH_TO_TOP := ..
 
-OBJECTS_PATH = objects
+#
+# Include details of the host OS configuration
+#
+include $(PATH_TO_TOP)/config
 
-ASFLAGS = -Iinclude
-CFLAGS = -Iinclude -D__NTOSKRNL__ -DDBG -g -Wall -Werror 
-#CFLAGS += -DDBGPRINT_FILE_LOG
+CONFIG :=
+
+ifeq ($(DBG), 1)
+CFLAGS_DBG := -g
+LINKER_SCRIPT := ntoskrnl.lnk
+STRIP_FLAGS := -Wl,-s
+else
+CFLAGS_DBG :=
+LINKER_SCRIPT := ntoskrnl.lnk
+STRIP_FLAGS := -Wl,-s
+endif
+
+ifeq ($(KDBG), 1)
+OBJECTS_KDBG := dbg/kdb.o dbg/kdb_keyboard.o dbg/rdebug.o \
+                dbg/i386/kdb_help.o dbg/kdb_stabs.o dbg/profile.o
+else
+OBJECTS_KDBG :=
+endif
+
+ifeq ($(strip $(SDK_PATH_INC)),)
+ASFLAGS += -I./include
+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
+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
+#
+include $(PATH_TO_TOP)/rules.mak
+
+
+TARGETNAME := ntoskrnl
+
+OBJECTS_PATH = objects
 
 all: \
        $(OBJECTS_PATH) \
+       bugcodes.rc \
        $(TARGETNAME).nostrip.exe \
-       $(TARGETNAME).exe
+       $(TARGETNAME).exe \
+       $(TARGETNAME).sym \
+       ntoskrnl.map
 
-# Hardware Abstraction Layer (Hal)
-# Defines $(OBJECTS_HAL)
 #
-include hal/x86/sources
+# Architecture specific Makefile
+# Defines $(OBJECTS_ARCH)
+#
+include Makefile.$(ARCH)
 
 # System API (Nt/Zw)
 OBJECTS_NT = \
-       nt/atom.o \
        nt/channel.o \
        nt/evtpair.o \
        nt/mutant.o \
@@ -37,36 +84,38 @@ OBJECTS_NT = \
        nt/profile.o \
        nt/zw.o \
        nt/vdm.o
-       
+
 # Run-Time Library (Rtl)
 OBJECTS_RTL = \
+       rtl/atom.o \
        rtl/bitmap.o \
+       rtl/compress.o \
        rtl/ctype.o \
+       rtl/dos8dot3.o \
        rtl/error.o \
-       rtl/interlck.o \
+       rtl/handle.o \
        rtl/largeint.o \
        rtl/mem.o \
-       rtl/memchr.o \
-       rtl/memcpy.o \
-       rtl/memmove.o \
-       rtl/memset.o \
+       rtl/message.o \
        rtl/nls.o \
-       rtl/qsort.o \
+       rtl/purecall.o \
+       rtl/random.o \
        rtl/regio.o \
        rtl/sprintf.o \
        rtl/stdlib.o \
        rtl/string.o \
        rtl/swprintf.o \
        rtl/time.o \
+       rtl/timezone.o \
        rtl/unicode.o \
        rtl/wstring.o \
-       rtl/bitops.o \
-       rtl/memcmp.o
+       rtl/capture.o
+
+OBJECTS_RTL := $(filter-out $(RTL_EXCLUDE_FILTER), $(OBJECTS_RTL))
+
 
 # Kernel (Ke)
-# Note: head.o MUST be the first file!!!
 OBJECTS_KE = \
-       ke/multiboot.o \
        ke/apc.o \
        ke/bug.o \
        ke/catch.o \
@@ -74,11 +123,7 @@ OBJECTS_KE = \
        ke/dpc.o \
        ke/error.o \
        ke/event.o \
-       ke/gdt.o \
-       ke/idt.o \
-       ke/kernel.o \
        ke/kqueue.o \
-       ke/ldt.o \
        ke/main.o \
        ke/mutex.o \
        ke/process.o \
@@ -86,26 +131,14 @@ OBJECTS_KE = \
        ke/spinlock.o \
        ke/timer.o \
        ke/wait.o \
-       ke/kthread.o
-
-OBJECTS_KE_I386 = \
-       ke/i386/exp.o \
-       ke/i386/irq.o \
-       ke/i386/irqhand.o \
-       ke/i386/thread.o \
-       ke/i386/usercall.o \
-       ke/i386/trap.o \
-       ke/i386/bthread.o \
-       ke/i386/syscall.o \
-       ke/i386/tskswitch.o \
-       ke/i386/v86m.o \
-       ke/i386/v86m_sup.o \
-       ke/i386/bios.o
+       ke/kthread.o \
+       ke/queue.o
+
 # Memory Manager (Mm)
 OBJECTS_MM = \
        mm/aspace.o \
        mm/cont.o \
+       mm/drvlck.o \
        mm/freelist.o \
        mm/iospace.o \
        mm/marea.o \
@@ -124,16 +157,18 @@ OBJECTS_MM = \
        mm/wset.o \
        mm/mminit.o \
        mm/kmap.o \
-       mm/mpw.o
-
-OBJECTS_MM_I386 = \
-       mm/i386/memsafe.o \
-       mm/i386/page.o \
-       mm/i386/pfault.o
+       mm/mpw.o \
+       mm/pageop.o \
+       mm/balance.o \
+       mm/rmap.o \
+       mm/slab.o \
+       mm/anonmem.o \
+       mm/region.o
 
 # I/O Subsystem (Io)
 OBJECTS_IO = \
        io/adapter.o \
+       io/arcname.o \
        io/buildirp.o \
        io/cancel.o \
        io/cleanup.o \
@@ -141,7 +176,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 \
@@ -151,14 +186,19 @@ OBJECTS_IO = \
        io/iocomp.o \
        io/ioctrl.o \
        io/iomgr.o \
+       io/iowork.o \
        io/irp.o \
        io/lock.o \
        io/mailslot.o \
        io/mdl.o \
        io/npipe.o \
        io/page.o \
+       io/parttab.o \
+       io/pnpmgr.o \
+       io/pnproot.o \
        io/process.o \
        io/queue.o \
+       io/rawfs.o \
        io/resource.o \
        io/rw.o \
        io/share.o \
@@ -176,34 +216,41 @@ OBJECTS_OB = \
        ob/namespc.o \
        ob/ntobj.o \
        ob/object.o \
-       ob/security.o
+       ob/security.o \
+       ob/symlink.o
 
 # Process Manager (Ps)
 OBJECTS_PS = \
        ps/create.o \
        ps/idle.o \
        ps/kill.o \
+       ps/locale.o \
        ps/process.o \
        ps/psmgr.o \
        ps/thread.o \
        ps/tinfo.o \
        ps/debug.o \
-       ps/suspend.o
+       ps/suspend.o \
+       ps/win32.o \
+       ps/w32call.o
 
 # Executive Subsystem (Ex)
 OBJECTS_EX = \
+  ex/btree.o \
        ex/callback.o \
        ex/fmutex.o \
+  ex/hashtab.o \
        ex/init.o \
        ex/interlck.o \
        ex/list.o \
-       ex/locale.o \
        ex/lookas.o \
        ex/napi.o \
        ex/power.o \
        ex/resource.o \
        ex/time.o \
+  ex/stree.o \
        ex/sysinfo.o \
+       ex/win32k.o \
        ex/work.o \
        ex/zone.o
 
@@ -225,6 +272,8 @@ OBJECTS_FS = \
 OBJECTS_SE = \
        se/access.o \
        se/acl.o \
+       se/audit.o \
+       se/lsa.o \
        se/luid.o \
        se/priv.o \
        se/sd.o \
@@ -234,13 +283,20 @@ OBJECTS_SE = \
 
 # Configuration Manager (Registry)
 OBJECTS_CM = \
-       cm/registry.o
+       cm/import.o  \
+       cm/registry.o  \
+       cm/ntfunc.o \
+       cm/rtlfunc.o \
+       cm/regfile.o \
+       cm/regobj.o
 
 # Debugger Support (Dbg)
 OBJECTS_DBG = \
-       dbg/brkpoint.o \
+       dbg/dbgctrl.o \
        dbg/errinfo.o \
-       dbg/print.o
+       dbg/print.o \
+       dbg/user.o \
+       $(OBJECTS_KDBG)
 
 # Loader
 OBJECTS_LDR = \
@@ -265,28 +321,44 @@ OBJECTS_LPC = \
        lpc/reply.o \
        lpc/send.o
 
-# Nation Language Support Library (Nls)
-OBJECTS_NLS = nls/nls.o
-
 # Power Management (Po)
 OBJECTS_PO = po/power.o
 
 # Cache Manager (Cc)
 OBJECTS_CC = \
        cc/cacheman.o \
-       cc/view.o
+       cc/view.o \
+       cc/copy.o \
+       cc/pin.o \
+       cc/misc.o
 
 # Kernel Debugger Support (Kd)
 OBJECTS_KD = \
        kd/kdebug.o \
        kd/service.o \
-       kd/dlog.o
+       kd/dlog.o \
+    kd/gdbstub.o \
+    kd/mda.o
 
-C_OBJECTS = $(OBJECTS_NT) $(OBJECTS_HAL) $(OBJECTS_MM) $(OBJECTS_MM_I386) \
-       $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_KE_I386) $(OBJECTS_OB) \
+# 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) \
        $(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \
-       $(OBJECTS_PO) $(OBJECTS_KD)     
+       $(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
+
 
 # Resources
 OBJECTS_RESOURCE = \
@@ -300,14 +372,13 @@ IE_DATA = \
 $(OBJECTS_PATH):
        mkdir $(OBJECTS_PATH)
 
+$(OBJECTS_RESOURCE): $(TARGETNAME).rc bugcodes.rc $(PATH_TO_TOP)/include/reactos/resource.h
+
 #
 # Build subsystem intermediate objects
 #
-$(OBJECTS_PATH)/hal.o: $(OBJECTS_HAL)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/hal.o \
-               $(OBJECTS_HAL)
+$(OBJECTS_PATH)/arch.o: $(OBJECTS_ARCH)
+       $(LD) -r -o $(OBJECTS_PATH)/arch.o $(OBJECTS_ARCH)
 
 $(OBJECTS_PATH)/io.o: $(OBJECTS_IO)
        $(LD) \
@@ -315,12 +386,11 @@ $(OBJECTS_PATH)/io.o: $(OBJECTS_IO)
                -o $(OBJECTS_PATH)/io.o \
                $(OBJECTS_IO)
 
-$(OBJECTS_PATH)/ke.o: $(OBJECTS_KE) $(OBJECTS_KE_I386)
+$(OBJECTS_PATH)/ke.o: $(OBJECTS_KE)
        $(LD) \
                -r \
                -o $(OBJECTS_PATH)/ke.o \
-               $(OBJECTS_KE) \
-               $(OBJECTS_KE_I386) 
+               $(OBJECTS_KE)
 
 $(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL)
        $(LD) \
@@ -328,12 +398,11 @@ $(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL)
                -o $(OBJECTS_PATH)/rtl.o \
                $(OBJECTS_RTL)
 
-$(OBJECTS_PATH)/mm.o: $(OBJECTS_MM) $(OBJECTS_MM_I386)
+$(OBJECTS_PATH)/mm.o: $(OBJECTS_MM)
        $(LD) \
                -r \
                -o $(OBJECTS_PATH)/mm.o \
-               $(OBJECTS_MM) \
-               $(OBJECTS_MM_I386)
+               $(OBJECTS_MM)
 
 $(OBJECTS_PATH)/ob.o: $(OBJECTS_OB)
        $(LD) \
@@ -389,12 +458,6 @@ $(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC)
                -o $(OBJECTS_PATH)/lpc.o \
                $(OBJECTS_LPC)
 
-$(OBJECTS_PATH)/nls.o: $(OBJECTS_NLS)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/nls.o \
-               $(OBJECTS_NLS)
-
 $(OBJECTS_PATH)/nt.o: $(OBJECTS_NT)
        $(LD) \
                -r \
@@ -411,21 +474,24 @@ $(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) 
-
-$(TARGETNAME).coff: $(TARGETNAME).rc ../include/reactos/resource.h
+               $(OBJECTS_KD)
 
+$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV)
+       $(LD) \
+               -r \
+               -o $(OBJECTS_PATH)/inbv.o \
+               $(OBJECTS_INBV)
 
-# Note: ke.o MUST be the first file!!!
-OBJECTS = \
+# Note: arch.o MUST be the first file!!!
+OBJECTS := \
+       $(OBJECTS_PATH)/arch.o \
        $(OBJECTS_PATH)/ke.o \
-       $(OBJECTS_PATH)/hal.o \
        $(OBJECTS_PATH)/cc.o \
        $(OBJECTS_PATH)/cm.o \
        $(OBJECTS_PATH)/dbg.o \
@@ -436,43 +502,33 @@ OBJECTS = \
        $(OBJECTS_PATH)/kd.o \
        $(OBJECTS_PATH)/ldr.o \
        $(OBJECTS_PATH)/mm.o \
-       $(OBJECTS_PATH)/nls.o \
        $(OBJECTS_PATH)/nt.o \
        $(OBJECTS_PATH)/ob.o \
        $(OBJECTS_PATH)/po.o \
        $(OBJECTS_PATH)/ps.o \
        $(OBJECTS_PATH)/rtl.o \
        $(OBJECTS_PATH)/se.o \
+       $(OBJECTS_PATH)/inbv.o \
        $(OBJECTS_RESOURCE)
 
 
-ifeq ($(DOSCLI),yes)
-CLEAN_FILES = $(OBJECTS_PATH)\*.o cc\*.o cm\*.o dbg\*.o ex\*.o hal\x86\*.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 $(TARGETNAME).a junk.tmp base.tmp temp.exp \
-              $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym $(TARGETNAME).coff $(filter-out nt/zw.%, $(C_OBJECTS:.o=.d))
-else
-CLEAN_FILES = $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o ex/*.o hal/x86/*.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 $(TARGETNAME).a junk.tmp base.tmp temp.exp \
-              $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym $(TARGETNAME).coff $(filter-out nt/zw.%, $(C_OBJECTS:.o=.d))
-endif
-
-
-$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(TARGETNAME).a $(IE_DATA)
+$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a 
        $(CC) \
                -Wl,-T,ntoskrnl.lnk \
-               -nostartfiles -nostdlib \
+               -nostartfiles \
+               -nostdlib \
                -mdll \
                -o junk.tmp \
                -Wl,--subsystem,native \
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,--base-file,base.tmp \
-               $(TARGETNAME).o -lgcc
+               $(TARGETNAME).o -lgcc \
+               $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
+               $(DDK_PATH_LIB)/hal.a
        - $(RM) junk.tmp
        $(DLLTOOL) \
                --dllname $(TARGETNAME).exe \
@@ -482,7 +538,8 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(TARGETNAME).a $(IE_DATA)
                --kill-at
        - $(RM) base.tmp
        $(CC) \
-               -nostartfiles -nostdlib \
+               -nostartfiles \
+               -nostdlib \
                -Wl,-T,ntoskrnl.lnk \
                -mdll \
                -o $(TARGETNAME).nostrip.exe \
@@ -490,25 +547,31 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(TARGETNAME).a $(IE_DATA)
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,temp.exp \
-               $(TARGETNAME).o -lgcc
+               $(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 $(TARGETNAME).a
-       $(STRIP) \
-               --strip-debug \
-               $(TARGETNAME).o
-       $(CC) \
-               -Wl,-T,ntoskrnl.lnk \
-               -nostartfiles -nostdlib \
+$(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 \
+               -nostdlib \
                -mdll \
                -o junk.tmp \
                -Wl,--subsystem,native \
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,--base-file,base.tmp \
-               $(TARGETNAME).o -lgcc
+               $(TARGETNAME).o -lgcc \
+               $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
+               $(DDK_PATH_LIB)/hal.a
        - $(RM) junk.tmp
        $(DLLTOOL) \
                --dllname $(TARGETNAME).exe \
@@ -518,19 +581,77 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(TARGETNAME).a
                --kill-at
        - $(RM) base.tmp
        $(CC) \
-               -Wl,-T,ntoskrnl.lnk \
-               -nostartfiles -nostdlib \
+               -Wl,-T,$(LINKER_SCRIPT) $(STRIP_FLAGS)\
+               -nostartfiles \
+               -nostdlib \
                -mdll \
                -o $(TARGETNAME).exe \
                -Wl,--subsystem,native \
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
+               -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 $(SDK_PATH_LIB)/rosrtl.a
+       $(CC) \
+               -Wl,-T,$(TARGETNAME).dbg.lnk \
+               -nostartfiles \
+               -nostdlib \
+               -mdll \
+               -o junk.tmp \
+               -Wl,--subsystem,native \
+               -Wl,--image-base,0xc0000000 \
+               -Wl,--file-alignment,0x1000 \
+               -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
+               -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) \
+               --dllname $(TARGETNAME).dbg \
+               --base-file base.tmp \
+               --output-exp temp.exp \
+               --def $(TARGETNAME).edf \
+               --kill-at
+       - $(RM) base.tmp
+       $(CC) \
+               -Wl,-T,$(TARGETNAME).dbg.lnk \
+               -nostartfiles \
+               -nostdlib \
+               -mdll \
+               -o $(TARGETNAME).dbg \
+               -Wl,--subsystem,native \
+               -Wl,--image-base,0xc0000000 \
+               -Wl,--file-alignment,0x1000 \
+               -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,temp.exp \
-               $(TARGETNAME).o -lgcc
+               $(TARGETNAME).dbg.o -lgcc \
+               $(SDK_PATH_LIB)/string.a \
+               $(SDK_PATH_LIB)/rosrtl.a \
+               $(DDK_PATH_LIB)/hal.a
        - $(RM) temp.exp
-       $(NM) --numeric-sort $(TARGETNAME).exe > $(TARGETNAME).sym
 
+$(TARGETNAME).sym: $(TARGETNAME).nostrip.exe
+       $(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) \
@@ -538,49 +659,97 @@ $(TARGETNAME).o: $(OBJECTS)
                -o $(TARGETNAME).o \
                $(OBJECTS)
 
-$(TARGETNAME).a: $(TARGETNAME).def
-       $(DLLTOOL) \
+bugcodes.rc: ntoskrnl.mc
+       $(MC) \
+               -H $(PATH_TO_TOP)/include/reactos/bugcodes.h \
+               -o bugcodes.rc \
+               $(TARGETNAME).mc
+
+$(DDK_PATH_LIB)/$(TARGETNAME).a: $(TARGETNAME).def
+       - $(DLLTOOL) \
                --dllname $(TARGETNAME).exe \
                --def $(TARGETNAME).def \
-               --output-lib $(TARGETNAME).a \
+               --output-lib $(DDK_PATH_LIB)/$(TARGETNAME).a \
                --kill-at
 
-clean: $(CLEAN_FILES:%=%_clean)
+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 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 \
+                 $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \
+             $(TAG_OBJECTS)
+
+
+.PHONY: clean
 
-$(CLEAN_FILES:%=%_clean): %_clean:
-       - $(RM) $*
+ifneq ($(BOOTCD_INSTALL),)
 
-.PHONY: clean $(CLEAN_FILES:%=%_clean)
+install: all $(INSTALL_DIR)/$(TARGETNAME).exe
 
-install: $(FLOPPY_DIR)/$(TARGETNAME).exe
+$(INSTALL_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
+       $(CP) $(TARGETNAME).exe $(INSTALL_DIR)/$(TARGETNAME).exe
+
+else # BOOTCD_INSTALL
+
+install: all $(INSTALL_DIR)/system32/$(TARGETNAME).exe $(INSTALL_DIR)/symbols/$(TARGETNAME).sym
+
+$(INSTALL_DIR)/system32/$(TARGETNAME).exe: $(TARGETNAME).exe
+       $(CP) $(TARGETNAME).exe $(INSTALL_DIR)/system32/$(TARGETNAME).exe
+
+$(INSTALL_DIR)/symbols/$(TARGETNAME).sym: $(TARGETNAME).sym
+       $(CP) $(TARGETNAME).sym $(INSTALL_DIR)/symbols/$(TARGETNAME).sym
+
+endif # BOOTCD_INSTALL
 
-$(FLOPPY_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
-       $(CP) $(TARGETNAME).exe $(FLOPPY_DIR)/$(TARGETNAME).exe
 
 .PHONY: install
 
-dist: ../$(DIST_DIR)/$(TARGETNAME).exe
+dist: $(DIST_DIR)/$(TARGETNAME).exe
 
-../$(DIST_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
-       $(CP) $(TARGETNAME).exe ../$(DIST_DIR)/$(TARGETNAME).exe
+$(DIST_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
+       $(CP) $(TARGETNAME).exe $(DIST_DIR)/$(TARGETNAME).exe
 
 .PHONY: dist
 
-ex/napi.o: ex/napi.c ../include/ntdll/napi.h
+bootcd: all $(BOOTCD_DIR)/reactos/$(TARGETNAME).exe
 
-ke/main.o: ke/main.c ../include/reactos/buildno.h
+$(BOOTCD_DIR)/reactos/$(TARGETNAME).exe: $(TARGETNAME).exe
+       $(CP) $(TARGETNAME).exe $(BOOTCD_DIR)/reactos/$(TARGETNAME).exe
 
-#include $(filter-out nt/zw.%, $(C_OBJECTS:.o=.d))
+.PHONY: bootcd
 
-%.d: %.c
-       $(CC) $(CFLAGS) -M -MG $< | sed -e 's#$(*F).o#$(@D)/&#g' | sed -e 's@ /[^ ]*@@g' -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@
 
-%.d: %.s
-       $(CC) $(CFLAGS) -M -MG $< | sed -e 's#$(*F).o#$(@D)/&#g' | sed -e 's@ /[^ ]*@@g' -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@
+ex/napi.o: ex/napi.c $(PATH_TO_TOP)/include/ntdll/napi.h
 
-%.d: %.S
-       $(CC) $(CFLAGS) -M -MG $< | sed -e 's#$(*F).o#$(@D)/&#g' | sed -e 's@ /[^ ]*@@g' -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@
+ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h
 
-include $(PATH_TO_TOP)/rules.mak
+%.o: %.cc
+       $(CC) $(CFLAGS) -c $< -o $@
+%.o: %.c
+       $(CC) $(CFLAGS) -c $< -o $@
+%.o: %.S
+       $(AS) $(ASFLAGS) -c $< -o $@
+%.o: %.s
+       $(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