Move bitmap functions to the shared rtl library.
[reactos.git] / reactos / ntoskrnl / Makefile
index f60ecd0..b1b9b62 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.56 2001/10/10 22:08:27 hbirr Exp $
+# $Id: Makefile,v 1.137 2004/08/10 12:05:20 ekohl Exp $
 #
 # ReactOS Operating System
 #
@@ -25,36 +25,65 @@ LINKER_SCRIPT := ntoskrnl.lnk
 STRIP_FLAGS := -Wl,-s
 endif
 
+ifeq ($(OPTIMIZED), 1)
+CFLAGS_OPT := -O2 -Wno-strict-aliasing
+else
+CFLAGS_OPT :=
+endif
+
 ifeq ($(KDBG), 1)
-OBJECTS_KDBG := dbg/kdb.o dbg/kdb_keyboard.o dbg/rdebug.o \
-                dbg/i386/kdb_help.o
+OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \
+                dbg/i386/kdb_help.o dbg/kdb_stabs.o dbg/profile.o \
+               ../dk/w32/lib/kjs.a dbg/i386/i386-dis.o
+CFLAGS += -I../lib/kjs/include
+preall: all
+
+../dk/w32/lib/kjs.a:
+       $(MAKE) -C ../lib/kjs
 else
 OBJECTS_KDBG :=
 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 $(CFLAGS_OPT)
 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 $(CFLAGS_OPT)
 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
+
+# no native setjmp/longjmp in the kernel
+CFLAGS += -D_SEH_NO_NATIVE_NLG
+
+CFLAGS += $(STD_CFLAGS)
+ASFLAGS += $(STD_ASFLAGS)
+RCFLAGS += $(STD_RCFLAGS)
+
 #
 # Build configuration
 #
 include $(PATH_TO_TOP)/rules.mak
 
+#
+# Javascript extension for kdb
+#
 
 TARGETNAME := ntoskrnl
 
 OBJECTS_PATH = objects
 
-all: \
-       $(OBJECTS_PATH) \
+all: $(OBJECTS_PATH) \
+       bugcodes.rc $(PATH_TO_TOP)/include/reactos/bugcodes.h \
        $(TARGETNAME).nostrip.exe \
        $(TARGETNAME).exe \
-       $(TARGETNAME).sym 
+       $(TARGETNAME).sym \
+       ntoskrnl.map
 
 #
 # Architecture specific Makefile
@@ -65,6 +94,7 @@ include Makefile.$(ARCH)
 # System API (Nt/Zw)
 OBJECTS_NT = \
        nt/channel.o \
+       nt/efi.o \
        nt/evtpair.o \
        nt/mutant.o \
        nt/misc.o \
@@ -74,38 +104,29 @@ OBJECTS_NT = \
        nt/nttimer.o \
        nt/plugplay.o \
        nt/profile.o \
-       nt/zw.o \
-       nt/vdm.o
+       nt/vdm.o \
+       nt/zw.o
 
 # Run-Time Library (Rtl)
 OBJECTS_RTL = \
        rtl/atom.o \
-       rtl/bitmap.o \
+       rtl/capture.o \
        rtl/ctype.o \
-       rtl/error.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/regio.o \
-       rtl/seh.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
+       rtl/nls.o \
+       rtl/rangelist.o \
+       rtl/libsupp.o
+
+OBJECTS_RTL := $(filter-out $(RTL_EXCLUDE_FILTER), $(OBJECTS_RTL))
+
 
 # Kernel (Ke)
 OBJECTS_KE = \
@@ -114,54 +135,67 @@ OBJECTS_KE = \
        ke/catch.o \
        ke/critical.o \
        ke/dpc.o \
+       ke/device.o \
        ke/error.o \
        ke/event.o \
        ke/kqueue.o \
+       ke/kthread.o \
        ke/main.o \
        ke/mutex.o \
        ke/process.o \
+       ke/profile.o \
+       ke/queue.o \
        ke/sem.o \
        ke/spinlock.o \
        ke/timer.o \
-       ke/wait.o \
-       ke/kthread.o
+       ke/wait.o
 
 # Memory Manager (Mm)
 OBJECTS_MM = \
+       mm/anonmem.o \
        mm/aspace.o \
+       mm/balance.o \
        mm/cont.o \
+       mm/drvlck.o \
        mm/freelist.o \
        mm/iospace.o \
+       mm/kmap.o \
        mm/marea.o \
        mm/mdl.o \
        mm/mm.o \
+       mm/mminit.o \
+       mm/mpw.o \
        mm/ncache.o \
        mm/npool.o \
        mm/pagfault.o \
        mm/pagefile.o \
+       mm/pageop.o \
+       mm/pager.o \
        mm/paging.o \
        mm/pool.o \
        mm/ppool.o \
+       mm/physical.o \
+       mm/region.o \
+       mm/rmap.o \
        mm/section.o \
+       mm/slab.o \
+       mm/verifier.o \
        mm/virtual.o \
-       mm/pager.o \
-       mm/wset.o \
-       mm/mminit.o \
-       mm/kmap.o \
-       mm/mpw.o \
-       mm/pageop.o
+       mm/wset.o
 
 # I/O Subsystem (Io)
 OBJECTS_IO = \
        io/adapter.o \
+       io/arcname.o \
        io/buildirp.o \
        io/cancel.o \
        io/cleanup.o \
        io/cntrller.o \
        io/create.o \
        io/device.o \
+       io/deviface.o \
        io/dir.o \
-       io/drvlck.o \
+       io/driver.o \
        io/errlog.o \
        io/error.o \
        io/event.o \
@@ -171,6 +205,7 @@ OBJECTS_IO = \
        io/iocomp.o \
        io/ioctrl.o \
        io/iomgr.o \
+       io/iowork.o \
        io/irp.o \
        io/lock.o \
        io/mailslot.o \
@@ -178,10 +213,15 @@ OBJECTS_IO = \
        io/npipe.o \
        io/page.o \
        io/parttab.o \
+       io/process.o \
+       io/pnpnotify.o \
+       io/pnpdma.o \
        io/pnpmgr.o \
+       io/pnpreport.o \
        io/pnproot.o \
-       io/process.o \
        io/queue.o \
+       io/rawfs.o \
+       io/remlock.o \
        io/resource.o \
        io/rw.o \
        io/share.o \
@@ -189,6 +229,8 @@ OBJECTS_IO = \
        io/symlink.o \
        io/timer.o \
        io/vpb.o \
+       io/wdm.o \
+       io/wmi.o \
        io/xhaldisp.o \
        io/xhaldrv.o
 
@@ -199,25 +241,32 @@ OBJECTS_OB = \
        ob/namespc.o \
        ob/ntobj.o \
        ob/object.o \
-       ob/security.o
+       ob/sdcache.o \
+       ob/security.o \
+       ob/symlink.o
 
 # Process Manager (Ps)
 OBJECTS_PS = \
        ps/create.o \
+       ps/debug.o \
        ps/idle.o \
+       ps/job.o \
        ps/kill.o \
        ps/locale.o \
        ps/process.o \
        ps/psmgr.o \
+       ps/suspend.o \
        ps/thread.o \
        ps/tinfo.o \
-       ps/debug.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 \
@@ -225,8 +274,12 @@ OBJECTS_EX = \
        ex/napi.o \
        ex/power.o \
        ex/resource.o \
-       ex/time.o \
+       ex/rundown.o \
+       ex/stree.o \
+       ex/synch.o \
        ex/sysinfo.o \
+       ex/time.o \
+       ex/util.o \
        ex/win32k.o \
        ex/work.o \
        ex/zone.o
@@ -249,6 +302,7 @@ OBJECTS_FS = \
 OBJECTS_SE = \
        se/access.o \
        se/acl.o \
+       se/audit.o \
        se/lsa.o \
        se/luid.o \
        se/priv.o \
@@ -260,11 +314,11 @@ OBJECTS_SE = \
 # Configuration Manager (Registry)
 OBJECTS_CM = \
        cm/import.o  \
-       cm/registry.o  \
        cm/ntfunc.o \
-       cm/rtlfunc.o \
        cm/regfile.o \
-       cm/regobj.o
+       cm/registry.o  \
+       cm/regobj.o \
+       cm/rtlfunc.o
 
 # Debugger Support (Dbg)
 OBJECTS_DBG = \
@@ -297,25 +351,31 @@ 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
+OBJECTS_PO = \
+       po/power.o
 
 # Cache Manager (Cc)
 OBJECTS_CC = \
        cc/cacheman.o \
-       cc/view.o \
        cc/copy.o \
+       cc/fs.o \
        cc/pin.o \
-       cc/misc.o
+       cc/mdl.o \
+       cc/misc.o \
+       cc/view.o
 
 # Kernel Debugger Support (Kd)
 OBJECTS_KD = \
+       kd/dlog.o \
+       kd/gdbstub.o \
        kd/kdebug.o \
-       kd/service.o \
-       kd/dlog.o
+       kd/mda.o \
+       kd/service.o
+
+# Boot video (Inbv)
+OBJECTS_INBV = \
+       inbv/inbv.o
 
 DEP_OBJECTS := $(OBJECTS_NT) $(OBJECTS_MM) $(OBJECTS_ARCH) \
        $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \
@@ -323,10 +383,13 @@ 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.%
+GENERATED_HEADER_FILES := $(PATH_TO_TOP)/include/reactos/bugcodes.h
 include $(PATH_TO_TOP)/tools/depend.mk
 
 
@@ -342,7 +405,7 @@ IE_DATA = \
 $(OBJECTS_PATH):
        mkdir $(OBJECTS_PATH)
 
-$(OBJECTS_RESOURCE): $(TARGETNAME).rc $(PATH_TO_TOP)/include/reactos/resource.h
+$(OBJECTS_RESOURCE): $(TARGETNAME).rc bugcodes.rc $(PATH_TO_TOP)/include/reactos/resource.h
 
 #
 # Build subsystem intermediate objects
@@ -360,7 +423,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) \
@@ -372,7 +435,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) \
@@ -428,12 +491,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 \
@@ -450,13 +507,19 @@ $(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)
+
+$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV)
+       $(LD) \
+               -r \
+               -o $(OBJECTS_PATH)/inbv.o \
+               $(OBJECTS_INBV)
 
 # Note: arch.o MUST be the first file!!!
 OBJECTS := \
@@ -472,36 +535,40 @@ 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)
 
-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 $(DEP_FILES)
-
-$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(DDK_PATH_LIB)/$(TARGETNAME).a $(IE_DATA)
+NTOSKRNL_LIBS := \
+       $(DDK_PATH_LIB)/hal.a \
+       $(SDK_PATH_LIB)/rtl.a \
+       $(SDK_PATH_LIB)/string.a \
+       $(SDK_PATH_LIB)/rosrtl.a \
+       $(SDK_PATH_LIB)/pseh.a
+
+NTOSKRNL_LD_FLAGS := \
+       -Wl,--subsystem,native \
+       -Wl,--image-base,0xc0000000 \
+       -Wl,--file-alignment,0x1000 \
+       -Wl,--section-alignment,0x1000 \
+       -Wl,--entry,_NtProcessStartup
+
+$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(NTOSKRNL_LIBS)
        $(CC) \
                -Wl,-T,ntoskrnl.lnk \
                -nostartfiles \
                -nostdlib \
                -mdll \
                -o junk.tmp \
-               -Wl,--subsystem,native \
-               -Wl,--image-base,0xc0000000 \
-               -Wl,--file-alignment,0x1000 \
-               -Wl,--section-alignment,0x1000 \
+               $(NTOSKRNL_LD_FLAGS) \
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).o -lgcc \
-               $(DDK_PATH_LIB)/hal.a
+               $(NTOSKRNL_LIBS)
        - $(RM) junk.tmp
        $(DLLTOOL) \
                --dllname $(TARGETNAME).exe \
@@ -516,29 +583,23 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(DDK_PATH_LIB)/$(TARGETNAME).a $(IE_
                -Wl,-T,ntoskrnl.lnk \
                -mdll \
                -o $(TARGETNAME).nostrip.exe \
-               -Wl,--subsystem,native \
-               -Wl,--image-base,0xc0000000 \
-               -Wl,--file-alignment,0x1000 \
-               -Wl,--section-alignment,0x1000 \
+               $(NTOSKRNL_LD_FLAGS) \
                -Wl,temp.exp \
                $(TARGETNAME).o -lgcc \
-               $(DDK_PATH_LIB)/hal.a
+               $(NTOSKRNL_LIBS)
        - $(RM) temp.exp
 
-$(TARGETNAME).exe: $(TARGETNAME).o $(DDK_PATH_LIB)/$(TARGETNAME).a $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
+$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
        - $(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 \
+               $(NTOSKRNL_LD_FLAGS) \
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).o -lgcc \
-               $(DDK_PATH_LIB)/hal.a
+               $(NTOSKRNL_LIBS)
        - $(RM) junk.tmp
        $(DLLTOOL) \
                --dllname $(TARGETNAME).exe \
@@ -553,32 +614,26 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(DDK_PATH_LIB)/$(TARGETNAME).a $(LINKER_SCRI
                -nostdlib \
                -mdll \
                -o $(TARGETNAME).exe \
-               -Wl,--subsystem,native \
-               -Wl,--image-base,0xc0000000 \
-               -Wl,--file-alignment,0x1000 \
-               -Wl,--section-alignment,0x1000 \
+               $(NTOSKRNL_LD_FLAGS) \
                -Wl,temp.exp \
                $(TARGETNAME).o -lgcc \
-               $(DDK_PATH_LIB)/hal.a
+               $(NTOSKRNL_LIBS)
        - $(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
+$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(NTOSKRNL_LIBS)
        $(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 \
+               $(NTOSKRNL_LD_FLAGS) \
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).dbg.o -lgcc \
-               $(DDK_PATH_LIB)/hal.a
+               $(NTOSKRNL_LIBS)
        - $(RM) junk.tmp
        $(DLLTOOL) \
                --dllname $(TARGETNAME).dbg \
@@ -593,17 +648,24 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
                -nostdlib \
                -mdll \
                -o $(TARGETNAME).dbg \
-               -Wl,--subsystem,native \
-               -Wl,--image-base,0xc0000000 \
-               -Wl,--file-alignment,0x1000 \
-               -Wl,--section-alignment,0x1000 \
+               $(NTOSKRNL_LD_FLAGS) \
                -Wl,temp.exp \
                $(TARGETNAME).dbg.o -lgcc \
-               $(DDK_PATH_LIB)/hal.a
+               $(NTOSKRNL_LIBS)
        - $(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))
+
+$(TARGETNAME).map: $(TARGETNAME).nostrip.exe
+ifeq ($(FULL_MAP),yes)
+       $(OBJDUMP) -d -S $(TARGETNAME).nostrip.exe > $(TARGETNAME).map
+else
+       $(NM) --numeric-sort $(TARGETNAME).nostrip.exe > $(TARGETNAME).map
+endif
 
 $(TARGETNAME).o: $(OBJECTS)
        $(LD) \
@@ -611,31 +673,58 @@ $(TARGETNAME).o: $(OBJECTS)
                -o $(TARGETNAME).o \
                $(OBJECTS)
 
+$(PATH_TO_TOP)/include/reactos/bugcodes.h 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) \
+       $(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
+
+test:
+       -
+
+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 ps/i386/*.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) $(PATH_TO_TOP)/include/reactos/bugcodes.h
+
 
-.PHONY: clean 
+.PHONY: clean
 
-install: $(INSTALL_DIR)/system32/$(TARGETNAME).exe
+ifneq ($(BOOTCD_INSTALL),)
+
+install:
+       - $(CP) $(TARGETNAME).exe $(INSTALL_DIR)/$(TARGETNAME).exe
+
+else # BOOTCD_INSTALL
+
+install:
+       - $(CP) $(TARGETNAME).exe $(INSTALL_DIR)/system32/$(TARGETNAME).exe
+       - $(CP) $(TARGETNAME).sym $(INSTALL_DIR)/symbols/$(TARGETNAME).sym
+
+endif # BOOTCD_INSTALL
 
-$(INSTALL_DIR)/system32/$(TARGETNAME).exe: $(TARGETNAME).exe
-       $(CP) $(TARGETNAME).exe $(INSTALL_DIR)/system32/$(TARGETNAME).exe
 
 .PHONY: install
 
-dist: $(DIST_DIR)/$(TARGETNAME).exe
+bootcd:
+       - $(CP) $(TARGETNAME).exe $(BOOTCD_DIR)/reactos/$(TARGETNAME).exe
 
-$(DIST_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
-       $(CP) $(TARGETNAME).exe $(DIST_DIR)/$(TARGETNAME).exe
+.PHONY: bootcd
 
-.PHONY: dist
 
 ex/napi.o: ex/napi.c $(PATH_TO_TOP)/include/ntdll/napi.h
 
@@ -648,10 +737,29 @@ 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 $@
+       $(RC) $(RCFLAGS) $< -o $@
+
+#
+#
+#
+.%.TAG: %.S
+       etags -o $@ $<
+
+.%.TAG: %.s
+       etags -o $@ $<
+
+.%.TAG: %.c
+       etags -o $@ $^
+
+
+docu:
+       doxygen Doxyfile
+
+.PHONY: docu
+
 
 # EOF