update files (rundll32 moved)
[reactos.git] / reactos / Makefile
index a58de65..475c184 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.248 2004/09/01 23:49:39 arty Exp $
+# $Id$
 #
 # Global makefile
 #
@@ -6,6 +6,7 @@
 PATH_TO_TOP = .
 
 include $(PATH_TO_TOP)/rules.mak
+include $(PATH_TO_TOP)/config
 
 #
 # Define to build ReactOS external targets
@@ -22,12 +23,15 @@ else
 IMPLIB = implib
 endif
 
+# Boot loaders
+BOOT_LOADERS = freeldr
+
 # Required to run the system
 COMPONENTS = ntoskrnl
 
 # Hardware Abstraction Layers
 # halx86
-HALS = halx86
+HALS = halx86/up halx86/mp
 
 # Bus drivers
 # acpi isapnp pci
@@ -37,24 +41,29 @@ BUS = acpi isapnp pci
 # vfatlib
 LIB_FSLIB = vfatlib
 
+# libunicode, must be empty!
+LIBUNICODE = 
+
 # Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns
+LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym wdmguid
 
 # Keyboard layout libraries
-DLLS_KBD = kbddv kbdfr kbdgr kbdse kbduk kbdus
+DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus
 
 # Control Panels
 DLLS_CPL = cpl
 
+# Shell extensions
+DLLS_SHELLEXT = shellext
+
 # User mode libraries
 # libpcap packet epsapi
-DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype \
-       gdi32 gdiplus glu32 imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 mpr msacm msafd msgina \
-       msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg opengl32 packet psapi \
-       richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 \
-       userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda \
-       dnsapi \
-       $(DLLS_KBD) $(DLLS_CPL)
+DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \
+       gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \
+       msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \
+       packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \
+       twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \
+       urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -64,13 +73,9 @@ SUBSYS = smss win32k csrss ntvdm
 #SERVERS = posix linux os2
 SERVERS = win32
 
-# Boot loaders
-# dos
-LOADERS = dos
-
 # Driver support libraries
 #bzip2 zlib oskittcp
-DRIVERS_LIB = bzip2 oskittcp csq
+DRIVERS_LIB = bzip2 oskittcp ip csq
 
 # Kernel mode device drivers
 # Obsolete: ide
@@ -97,14 +102,15 @@ NET_DEVICE_DRIVERS = ne2000 pcnet
 STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
 
 # System applications
-# autochk cmd format services setup usetup welcome winlogon
-SYS_APPS = autochk cmd explorer expand format services setup taskmgr userinit usetup welcome vmwinst winlogon regedit
+# autochk cmd format services setup usetup welcome winlogon msiexec 
+SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \
+  reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \
+  winlogon regedit winefile notepad reactos lsass
 
 # System services
-# rpcss eventlog
-SYS_SVC = rpcss eventlog
+SYS_SVC = rpcss eventlog umpnpmgr
 
-APPS = tests testsets utils
+APPS = testsets utils
 
 
 # External modules and (sub)systems for ReactOS
@@ -118,88 +124,97 @@ EXT_MODULES =
 endif
 
 KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
-       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS
+       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS USB_DRIVERS
 
 # Regression tests
 REGTESTS = regtests
 
-all: bootstrap $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \
-     $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \
-     $(APPS) $(EXT_MODULES)
+all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \
+     $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES)
 
-bootstrap: dk implib iface_native iface_additional
-
-#config: $(TOOLS:%=%_config)
+bootstrap: dk implib iface_native
 
 depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) msvcrt_depends $(DLLS:%=%_depends) \
          $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
          $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
 
-implib: hallib $(LIB_STATIC) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
-             $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) msvcrt_implib $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
-             $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
-             $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) $(EXT_MODULES:%=%_implib)
+implib: hallib $(LIB_STATIC) $(LIB_FSLIB) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \
+        $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) \
+        msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \
+        $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
+        $(EXT_MODULES:%=%_implib) $(REGTESTS:%=%_implib)
 
-test: $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \
-           $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test $(DLLS:%=%_test) $(LOADERS:%=%_test) \
+test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \
+           $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test $(DLLS:%=%_test) \
            $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \
            $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test)
 
-clean: tools dk_clean $(HALS:%=%_clean) \
-       $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \
-       msvcrt_clean $(DLLS:%=%_clean) $(LOADERS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) $(SUBSYS:%=%_clean) \
-       $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) $(NET_APPS:%=%_clean) \
-       $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) $(REGTESTS:%=%_clean) \
-       clean_after tools_clean
+clean: tools dk_clean iface_native_clean hallib_clean \
+       $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \
+       $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \
+       msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \
+       $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) \
+       $(NET_APPS:%=%_clean) $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) \
+       $(REGTESTS:%=%_clean) clean_after tools_clean
 
 clean_after:
+       $(HALFVERBOSEECHO) [RM]      /include/roscfg.h
        $(RM) $(PATH_TO_TOP)/include/roscfg.h
 
-fastinstall: tools install_dirs install_before \
-         $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
-         $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) msvcrt_install $(DLLS:%=%_install) \
-         $(LOADERS:%=%_install) $(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \
-         $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
+fastinstall: tools install_dirs install_before $(COMPONENTS:%=%_install) $(HALS:%=%_install) \
+         $(BUS:%=%_install) $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) \
+         msvcrt_install $(DLLS:%=%_install) $(KERNEL_DRIVERS:%=%_install) \
+         $(SUBSYS:%=%_install) $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
          $(APPS:%=%_install) $(EXT_MODULES:%=%_install) $(REGTESTS:%=%_install)
 install: fastinstall registry
 
-FREELDR_DIR = ../freeldr
-
-freeldr:
-       $(MAKE) -C $(FREELDR_DIR)
+FREELDR_DIR = boot/freeldr
 
 bootcd_directory_layout:
+       $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)
        $(RMKDIR) $(BOOTCD_DIR)
+       $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/bootdisk
        $(RMKDIR) $(BOOTCD_DIR)/bootdisk
+       $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/loader
        $(RMKDIR) $(BOOTCD_DIR)/loader
+       $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/reactos
        $(RMKDIR) $(BOOTCD_DIR)/reactos
+       $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/reactos/system32
        $(RMKDIR) $(BOOTCD_DIR)/reactos/system32
-       $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin
-       $(CP) ${FREELDR_DIR}/bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin
-       $(CP) ${FREELDR_DIR}/bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin
-       $(CP) ${FREELDR_DIR}/bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin
-       $(CP) ${FREELDR_DIR}/bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin
-       $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin
-       $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys
-       $(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys
-
-bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \
-       $(LIB_STATIC:%=%_bootcd) $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \
-  $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd)
+
+bootcd_bootstrap_files: $(BOOT_LOADERS:%=%_bootcd) $(COMPONENTS:%=%_bootcd) \
+       $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) $(LIB_STATIC:%=%_bootcd) \
+       $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \
+       $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd)
 
 bootcd_install_before:
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/autorun.inf to $(BOOTCD_DIR)/autorun.inf
        $(RLINE) bootdata/autorun.inf $(BOOTCD_DIR)/autorun.inf
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/readme.txt to $(BOOTCD_DIR)/readme.txt
        $(RLINE) bootdata/readme.txt $(BOOTCD_DIR)/readme.txt
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/hivecls.inf to $(BOOTCD_DIR)/reactos/hivecls.inf
        $(RLINE) bootdata/hivecls.inf $(BOOTCD_DIR)/reactos/hivecls.inf
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/hivedef.inf to $(BOOTCD_DIR)/reactos/hivedef.inf
        $(RLINE) bootdata/hivedef.inf $(BOOTCD_DIR)/reactos/hivedef.inf
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/hivesft.inf to $(BOOTCD_DIR)/reactos/hivesft.inf
        $(RLINE) bootdata/hivesft.inf $(BOOTCD_DIR)/reactos/hivesft.inf
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/hivesys.inf to $(BOOTCD_DIR)/reactos/hivesys.inf
        $(RLINE) bootdata/hivesys.inf $(BOOTCD_DIR)/reactos/hivesys.inf
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/txtsetup.sif to $(BOOTCD_DIR)/reactos/txtsetup.sif
        $(RLINE) bootdata/txtsetup.sif $(BOOTCD_DIR)/reactos/txtsetup.sif
+       $(HALFVERBOSEECHO) [COPY]    bootdata/icon.ico to $(BOOTCD_DIR)/icon.ico
        $(CP) bootdata/icon.ico $(BOOTCD_DIR)/icon.ico
+       $(HALFVERBOSEECHO) [COPY]    subsys/system/welcome/welcome.exe  to $(BOOTCD_DIR)/reactos/welcome.exe
        $(CP) subsys/system/welcome/welcome.exe $(BOOTCD_DIR)/reactos/welcome.exe
+       $(HALFVERBOSEECHO) [COPY]    subsys/system/reactos/reactos.exe  to $(BOOTCD_DIR)/reactos/reactos.exe
+       $(CP) subsys/system/reactos/reactos.exe $(BOOTCD_DIR)/reactos/reactos.exe
+       $(HALFVERBOSEECHO) [COPY]    media/nls/c_1252.nls to $(BOOTCD_DIR)/reactos/c_1252.nls
        $(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls
+       $(HALFVERBOSEECHO) [COPY]    media/nls/c_437.nls to $(BOOTCD_DIR)/reactos/c_437.nls
        $(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
+       $(HALFVERBOSEECHO) [COPY]    media/nls/l_intl.nls to $(BOOTCD_DIR)/reactos/l_intl.nls
        $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
+       $(HALFVERBOSEECHO) [COPY]    media/drivers/etc/services to $(BOOTCD_DIR)/reactos/services
        $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
 
 bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
@@ -208,20 +223,31 @@ bootcd_makecd:
        $(CABMAN) /C bootdata/packages/reactos.dff /L $(BOOTCD_DIR)/reactos /I
        $(CABMAN) /C bootdata/packages/reactos.dff /RC $(BOOTCD_DIR)/reactos/reactos.inf /L $(BOOTCD_DIR)/reactos /N
        - $(RM) $(BOOTCD_DIR)/reactos/reactos.inf
+       $(HALFVERBOSEECHO) [CDMAKE]  ReactOS.iso
        $(CDMAKE) -v -m -b $(BOOTCD_DIR)/../isoboot.bin $(BOOTCD_DIR) REACTOS ReactOS.iso
 
 ubootcd_unattend:
+       $(HALFVERBOSEECHO) [COPY]    bootdata/unattend.inf to $(BOOTCD_DIR)/reactos/unattend.inf
        $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
 
 livecd_directory_layout:
+       $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)
        $(RMKDIR) $(LIVECD_DIR)
+       $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/loader
        $(RMKDIR) $(LIVECD_DIR)/loader
+       $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/reactos
        $(RMKDIR) $(LIVECD_DIR)/reactos
+       $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/All\ Users/Desktop
        $(RMKDIR) $(LIVECD_DIR)/Profiles/All\ Users/Desktop
+       $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/Default\ User/Desktop
        $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/Desktop
+       $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
        $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
+       $(HALFVERBOSEECHO) [COPY]    ${FREELDR_DIR}/bootsect/isoboot.bin to ${LIVECD_DIR}/../isoboot.bin
        $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${LIVECD_DIR}/../isoboot.bin
-       $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
+       $(HALFVERBOSEECHO) [COPY]    ${FREELDR_DIR}/freeldr/freeldr.sys to ${LIVECD_DIR}/loader/setupldr.sys
+       $(CP) ${FREELDR_DIR}/freeldr/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
+       $(HALFVERBOSEECHO) [RLINE]   bootdata/livecd.ini to $(LIVECD_DIR)/freeldr.ini
        $(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini
 
 livecd_bootstrap_files:
@@ -233,6 +259,7 @@ livecd_install_before:
 livecd_basic: livecd_directory_layout livecd_bootstrap_files livecd_install_before
 
 livecd_makecd:
+       $(HALFVERBOSEECHO) [CDMAKE]  roslive.iso
        $(CDMAKE) -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso
 
 bootcd: bootcd_basic bootcd_makecd
@@ -244,10 +271,28 @@ livecd: livecd_basic livecd_makecd
 registry: tools
        $(MKHIVE) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf
 
-.PHONY: all bootstrap depends implib test clean clean_before install freeldr bootcd_directory_layout \
+.PHONY: all bootstrap depends implib test clean clean_before install bootcd_directory_layout \
 bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd
 
 
+#
+# Boot Loaders
+#
+$(BOOT_LOADERS): %:
+       $(MAKE) -C boot/$*
+
+$(BOOT_LOADERS:%=%_test): %_test:
+       $(MAKE) -C boot/$* test
+
+$(BOOT_LOADERS:%=%_clean): %_clean:
+       $(MAKE) -C boot/$* clean
+
+$(BOOT_LOADERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C boot/$* bootcd
+
+.PHONY: $(BOOT_LOADERS) $(BOOT_LOADERS:%=%_test) $(BOOT_LOADERS:%=%_clean) \
+        $(BOOT_LOADERS:%=%_bootcd)
+
 $(COMPONENTS): dk
 
 #
@@ -385,17 +430,29 @@ dk_implib:
 # WARNING! Be very sure that there are no important files
 #          in these directories before cleaning them!!!
 dk_clean:
+       $(HALFVERBOSEECHO) [RM]      $(DDK_PATH_LIB)/*.a
        $(RM) $(DDK_PATH_LIB)/*.a
-# $(RM) $(DDK_PATH_INC)/*.h
+#      $(HALFVERBOSEECHO) [RM]      $(DDK_PATH_INC)/*.h
+#      $(RM) $(DDK_PATH_INC)/*.h
+       $(HALFVERBOSEECHO) [RMDIR]   $(DDK_PATH_LIB)
        $(RMDIR) $(DDK_PATH_LIB)
+#      $(HALFVERBOSEECHO) [RMDIR]   $(DDK_PATH_INC)
 #      $(RMDIR) $(DDK_PATH_INC)
+       $(HALFVERBOSEECHO) [RM]      $(SDK_PATH_LIB)/*.a
        $(RM) $(SDK_PATH_LIB)/*.a
-# $(RM) $(SDK_PATH_INC)/*.h
+#      $(HALFVERBOSEECHO) [RM]      $(SDK_PATH_INC)/*.h
+#      $(RM) $(SDK_PATH_INC)/*.h
+       $(HALFVERBOSEECHO) [RMDIR]   $(SDK_PATH_LIB)
        $(RMDIR) $(SDK_PATH_LIB)
+#      $(HALFVERBOSEECHO) [RMDIR]   $(SDK_PATH_INC)
 #      $(RMDIR) $(SDK_PATH_INC)
+       $(HALFVERBOSEECHO) [RM]      $(XDK_PATH_LIB)/*.a
        $(RM) $(XDK_PATH_LIB)/*.a
+#      $(HALFVERBOSEECHO) [RM]      $(XDK_PATH_INC)/*.h
 #      $(RM) $(XDK_PATH_INC)/*.h
+       $(HALFVERBOSEECHO) [RMDIR]   $(XDK_PATH_LIB)
        $(RMDIR) $(XDK_PATH_LIB)
+#      $(HALFVERBOSEECHO) [RMDIR]   $(XDK_PATH_INC)
 #      $(RMDIR) $(XDK_PATH_INC)
 
 dk_install:
@@ -407,37 +464,21 @@ dk_install:
 # Interfaces
 #
 iface_native:
-       $(MAKE) --silent -C iface/native
+       $(MAKE) --silent -C tools/nci
 
 iface_native_implib:
        
 iface_native_test:
        
 iface_native_clean:
-       $(MAKE) --silent -C iface/native clean
+       $(MAKE) --silent -C tools/nci clean
 
 iface_native_install:
 
 iface_native_bootcd:
 
-iface_additional:
-       $(MAKE) --silent -C iface/addsys
-
-iface_additional_implib:
-       
-iface_additional_test:
-       
-iface_additional_clean:
-       $(MAKE) --silent -C iface/addsys clean
-
-iface_additional_install:
-
-iface_additional_bootcd:
-
 .PHONY: iface_native iface_native_implib iface_native_test iface_native_clean \
-        iface_native_install iface_native_bootcd iface_additional \
-        iface_additional_implib iface_additional_test iface_additional_clean \
-        iface_additional_install iface_additional_bootcd
+        iface_native_install iface_native_bootcd
 
 
 #
@@ -539,6 +580,30 @@ VIDEO_DRIVERS_bootcd:
 .PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_test\
         VIDEO_DRIVERS_clean VIDEO_DRIVERS_install VIDEO_DRIVERS_bootcd
 
+#
+# USB device driver rules
+#
+USB_DRIVERS: $(IMPLIB)
+       $(MAKE) -C drivers/usb
+
+USB_DRIVERS_implib: dk
+       $(MAKE) --silent -C drivers/usb implib
+
+USB_DRIVERS_test:
+       $(MAKE) -C drivers/usb test
+
+USB_DRIVERS_clean:
+       $(MAKE) -C drivers/usb clean
+
+USB_DRIVERS_install:
+       $(MAKE) -C drivers/usb install
+
+USB_DRIVERS_bootcd:
+       $(MAKE) -C drivers/usb bootcd
+
+.PHONY: USB_DRIVERS USB_DRIVERS_implib USB_DRIVERS_test\
+        USB_DRIVERS_clean USB_DRIVERS_install USB_DRIVERS_bootcd
+
 
 #
 # Input driver rules
@@ -666,26 +731,6 @@ $(STORAGE_DRIVERS:%=%_bootcd): %_bootcd:
         $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd)
 
 
-#
-# Kernel loaders
-#
-$(LOADERS): %:
-       $(MAKE) -C loaders/$*
-
-$(LOADERS:%=%_implib): %_implib: dk
-
-$(LOADERS:%=%_test): %_test:
-
-$(LOADERS:%=%_clean): %_clean:
-       $(MAKE) -C loaders/$* clean
-
-$(LOADERS:%=%_install): %_install:
-       $(MAKE) -C loaders/$* install
-
-.PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_test) \
-        $(LOADERS:%=%_clean) $(LOADERS:%=%_install)
-
-
 #
 # Required system components
 #
@@ -739,6 +784,12 @@ hallib_bootcd:
 #
 # Hardware Abstraction Layers
 #
+ifeq ($(CONFIG_SMP),1)
+halx86: halx86/mp
+else
+halx86: halx86/up
+endif
+
 $(HALS): %: $(IMPLIB)
        $(MAKE) -C hal/$*
 
@@ -909,6 +960,9 @@ $(SUBSYS:%=%_bootcd): %_bootcd:
 $(REGTESTS): %: $(IMPLIB)
        $(MAKE) --silent -C regtests
 
+$(REGTESTS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C regtests implib
+
 $(REGTESTS:%=%_clean): %_clean:
        $(MAKE) -C regtests clean
 
@@ -923,50 +977,72 @@ $(REGTESTS:%=%_install): %_install:
 #
 
 install_clean:
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/drivers/*.*
        $(RM) $(INSTALL_DIR)/system32/drivers/*.*
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/config/*.*
        $(RM) $(INSTALL_DIR)/system32/config/*.*
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/*.*
        $(RM) $(INSTALL_DIR)/system32/*.*
-       $(RM) $(INSTALL_DIR)/symbols/*.*
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/media/fonts/*.*
        $(RM) $(INSTALL_DIR)/media/fonts/*.*
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/media/*.*
        $(RM) $(INSTALL_DIR)/media/*.*
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/inf/*.*
        $(RM) $(INSTALL_DIR)/inf/*.*
+       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/bin/*.*
        $(RM) $(INSTALL_DIR)/bin/*.*
-       $(RM) $(INSTALL_DIR)/*.com
-       $(RM) $(INSTALL_DIR)/*.bat
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32/drivers
        $(RMDIR) $(INSTALL_DIR)/system32/drivers
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32/config
        $(RMDIR) $(INSTALL_DIR)/system32/config
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32
        $(RMDIR) $(INSTALL_DIR)/system32
-       $(RMDIR) $(INSTALL_DIR)/symbols
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/media/fonts
        $(RMDIR) $(INSTALL_DIR)/media/fonts
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/media
        $(RMDIR) $(INSTALL_DIR)/media
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/inf
        $(RMDIR) $(INSTALL_DIR)/inf
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/bin
        $(RMDIR) $(INSTALL_DIR)/bin
+       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)
        $(RMDIR) $(INSTALL_DIR)
 
 install_dirs:
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)
        $(RMKDIR) $(INSTALL_DIR)
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/bin
        $(RMKDIR) $(INSTALL_DIR)/bin
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/inf
        $(RMKDIR) $(INSTALL_DIR)/inf
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/media
        $(RMKDIR) $(INSTALL_DIR)/media
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/media/fonts
        $(RMKDIR) $(INSTALL_DIR)/media/fonts
-       $(RMKDIR) $(INSTALL_DIR)/symbols
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32
        $(RMKDIR) $(INSTALL_DIR)/system32
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/config
        $(RMKDIR) $(INSTALL_DIR)/system32/config
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/drivers
        $(RMKDIR) $(INSTALL_DIR)/system32/drivers
+       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/drivers/etc
        $(RMKDIR) $(INSTALL_DIR)/system32/drivers/etc
 
 install_before:
-       $(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
-       $(CP) boot.bat $(INSTALL_DIR)/boot.bat
-       $(CP) aboot.bat $(INSTALL_DIR)/aboot.bat
+       $(HALFVERBOSEECHO) [INSTALL] media/inf to $(INSTALL_DIR)/inf
        $(CP) media/inf $(INSTALL_DIR)/inf
+       $(HALFVERBOSEECHO) [INSTALL] media/fonts to $(INSTALL_DIR)/media/fonts
        $(CP) media/fonts $(INSTALL_DIR)/media/fonts
+       $(HALFVERBOSEECHO) [INSTALL] media/nls to $(INSTALL_DIR)/system32
        $(CP) media/nls $(INSTALL_DIR)/system32
+       $(HALFVERBOSEECHO) [INSTALL] media/nls/c_1252.nls to $(INSTALL_DIR)/system32/ansi.nls
        $(CP) media/nls/c_1252.nls $(INSTALL_DIR)/system32/ansi.nls
+       $(HALFVERBOSEECHO) [INSTALL] media/nls/c_437.nls to $(INSTALL_DIR)/system32/oem.nls
        $(CP) media/nls/c_437.nls $(INSTALL_DIR)/system32/oem.nls
+       $(HALFVERBOSEECHO) [INSTALL] media/nls/l_intl.nls to $(INSTALL_DIR)/system32/casemap.nls
        $(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls
-       $(CP) media/drivers/etc/services \
-               $(INSTALL_DIR)/system32/drivers/etc/services
+       $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/services to $(INSTALL_DIR)/system32/drivers/etc/services
+       $(CP) media/drivers/etc/services $(INSTALL_DIR)/system32/drivers/etc/services
 
 .PHONY: install_clean install_dirs install_before