compile the sm system utility
[reactos.git] / reactos / Makefile
index a05bc79..042e73b 100644 (file)
@@ -1,10 +1,13 @@
-# $Id: Makefile,v 1.227 2004/06/05 11:11:13 chorns Exp $
+# $Id$
 #
 # Global makefile
 #
 
 PATH_TO_TOP = .
 
+include $(PATH_TO_TOP)/rules.mak
+include $(PATH_TO_TOP)/config
+
 #
 # Define to build ReactOS external targets
 #
@@ -14,41 +17,54 @@ else
 ROS_BUILD_EXT = yes
 endif
 
-include $(PATH_TO_TOP)/rules.mak
+ifneq ($(MINIMALDEPENDENCIES),no)
+IMPLIB =
+else
+IMPLIB = implib
+endif
 
-# System call entry points and ntoskrnl dependants
-COMPONENTS = iface_native iface_additional hallib
+# 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
-BUS = acpi isapnp pci
+# acpi isapnp pci serenum
+BUS = acpi isapnp pci serenum
 
 # Filesystem libraries
 # vfatlib
 LIB_FSLIB = vfatlib
 
+# libunicode, must be empty!
+LIBUNICODE = 
+
 # Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt
+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 kbdru kbdse kbdsg kbduk kbdus
 
 # Control Panels
 DLLS_CPL = cpl
 
+# Shell extensions
+DLLS_SHELLEXT = shellext
+
 # User mode libraries
-# advapi32 cards crtdll comdlg32 fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll
-# epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
-# imagehlp imm32
-DLLS = advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
-       imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 mswsock \
-       netapi32 ntdll ole32 oleaut32 oledlg packet psapi richedit rpcrt4 samlib secur32 \
-       setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 userenv version wininet \
-       winmm winspool ws2help ws2_32 wsock32 wshirda imagehlp $(DLLS_KBD) $(DLLS_CPL)
+# libpcap packet epsapi
+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 serialui setupapi shell32 shlwapi smlib smdll snmpapi \
+       syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \
+       urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv dhcpcapi \
+       $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -58,21 +74,17 @@ 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
+DRIVERS_LIB = bzip2 oskittcp ip csq
 
 # Kernel mode device drivers
 # Obsolete: ide
 # beep blue floppy null parallel ramdrv serenum serial
-DEVICE_DRIVERS = beep blue debugout floppy null serial bootvid
+DEVICE_DRIVERS = beep blue debugout null serial bootvid
 
 # Kernel mode input drivers
-INPUT_DRIVERS = keyboard mouclass psaux sermouse
+INPUT_DRIVERS = mouclass sermouse i8042prt kbdclass
 
 # Kernel mode file system drivers
 # cdfs ext2 fs_rec ms np vfat
@@ -88,17 +100,18 @@ NET_DEVICE_DRIVERS = ne2000 pcnet
 
 # Kernel mode storage drivers
 # atapi cdrom class2 disk scsiport
-STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump
+STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
 
 # System applications
-# autochk cmd format services setup usetup welcome winlogon
-SYS_APPS = autochk cmd explorer 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 regsvr32 \
+  reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \
+  winlogon regedit winefile notepad reactos lsass dhcp sm
 
 # 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
@@ -112,82 +125,100 @@ 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
 
-sequence: tools dk implib $(LIB_STATIC) $(COMPONENTS)
+all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \
+     $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES)
 
-part1: ntoskrnl $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS)
+bootstrap: dk implib iface_native
 
-part2: $(SUBSYS) $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES)
-
-all: sequence part1 part2
-
-depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) $(DLLS:%=%_depends) $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
+depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) msvcrt_depends $(DLLS:%=%_depends) \
+         $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
          $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
 
-implib: ntoskrnl_implib $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
-       $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
-       $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
-       $(SYS_SVC:%=%_implib) $(EXT_MODULES:%=%_implib)
-
-clean: tools dk_clean \
-       ntoskrnl_clean $(COMPONENTS:%=%_clean) $(HALS:%=%_clean) $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) \
-       $(LIB_FSLIB:%=%_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
+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: $(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 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 \
-         ntoskrnl_install $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
-         $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_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: ntoskrnl_bootcd $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \
-       $(LIB_STATIC:%=%_bootcd) $(LIB_FSLIB:%=%_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
+       $(HALFVERBOSEECHO) [COPY]    media/drivers/etc/KDBinit to $(BOOTCD_DIR)/reactos/KDBinit
+       $(CP) media/drivers/etc/KDBinit $(BOOTCD_DIR)/reactos/KDBinit
 
 bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
 
@@ -195,32 +226,44 @@ 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
-       $(TOOLS_PATH)/cdmake/cdmake -v -m -b $(BOOTCD_DIR)/../isoboot.bin $(BOOTCD_DIR) REACTOS ReactOS.iso
+       $(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:
        $(MAKE) LIVECD_INSTALL=yes fastinstall
 
 livecd_install_before:
-       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(LIVECD_DIR)/reactos/system32/config bootdata/livecd.inf
+       $(MKHIVE) bootdata $(LIVECD_DIR)/reactos/system32/config bootdata/livecd.inf bootdata/hiveinst.inf
 
 livecd_basic: livecd_directory_layout livecd_bootstrap_files livecd_install_before
 
 livecd_makecd:
-       $(TOOLS_PATH)/cdmake/cdmake -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso
+       $(HALFVERBOSEECHO) [CDMAKE]  roslive.iso
+       $(CDMAKE) -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso
 
 bootcd: bootcd_basic bootcd_makecd
 
@@ -229,20 +272,43 @@ ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd
 livecd: livecd_basic livecd_makecd
 
 registry: tools
-       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(INSTALL_DIR)/system32/config
+       $(MKHIVE) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf
 
-.PHONY: all sequence part1 part2 depends implib 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
+
 #
 # System Applications
 #
-$(SYS_APPS): %:
+$(SYS_APPS): %: $(IMPLIB)
        $(MAKE) -C subsys/system/$*
 
-$(SYS_APPS:%=%_implib): %_implib:
-       $(MAKE) -C subsys/system/$* implib
+$(SYS_APPS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C subsys/system/$* implib
+
+$(SYS_APPS:%=%_test): %_test:
+       $(MAKE) -C subsys/system/$* test
 
 $(SYS_APPS:%=%_clean): %_clean:
        $(MAKE) -C subsys/system/$* clean
@@ -253,19 +319,23 @@ $(SYS_APPS:%=%_install): %_install:
 $(SYS_APPS:%=%_bootcd): %_bootcd:
        $(MAKE) -C subsys/system/$* bootcd
 
-.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd)
+.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_test) \
+  $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd)
 
 #
 # System Services
 #
-$(SYS_SVC): %:
+$(SYS_SVC): %: $(IMPLIB)
        $(MAKE) -C services/$*
 
 $(SYS_SVC:%=%_depends): %_depends:
        $(MAKE) -C services/$* depends
 
-$(SYS_SVC:%=%_implib): %_implib:
-       $(MAKE) -C services/$* implib
+$(SYS_SVC:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C services/$* implib
+
+$(SYS_SVC:%=%_test): %_test:
+       $(MAKE) -C services/$* test
 
 $(SYS_SVC:%=%_clean): %_clean:
        $(MAKE) -C services/$* clean
@@ -273,7 +343,8 @@ $(SYS_SVC:%=%_clean): %_clean:
 $(SYS_SVC:%=%_install): %_install:
        $(MAKE) -C services/$* install
 
-.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install)
+.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) \
+  $(SYS_SVC:%=%_test) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install)
 
 
 #
@@ -282,12 +353,15 @@ $(SYS_SVC:%=%_install): %_install:
 #
 # Extra (optional system) Applications
 #
-$(APPS): %:
+$(APPS): %: $(IMPLIB)
        $(MAKE) -C apps/$*
 
 # Not needed
-# $(APPS:%=%_implib): %_implib:
-#      $(MAKE) -C apps/$* implib
+# $(APPS:%=%_implib): %_implib: dk
+#      $(MAKE) --silent -C apps/$* implib
+
+$(APPS:%=%_test): %_test:
+       $(MAKE) -C apps/$* test
 
 $(APPS:%=%_clean): %_clean:
        $(MAKE) -C apps/$* clean
@@ -295,7 +369,7 @@ $(APPS:%=%_clean): %_clean:
 $(APPS:%=%_install): %_install:
        $(MAKE) -C apps/$* install
 
-.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install)
+.PHONY: $(APPS) $(APPS:%=%_test) $(APPS:%=%_clean) $(APPS:%=%_install)
 
 
 #
@@ -307,8 +381,8 @@ $(EXTERNALS): %:
 $(EXTERNALS:%=%_depends): %_depends:
        $(MAKE) -C $(ROOT_PATH)/$* depends
 
-$(EXTERNALS:%=%_implib): %_implib:
-       $(MAKE) -C $(ROOT_PATH)/$* implib
+$(EXTERNALS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C $(ROOT_PATH)/$* implib
 
 $(EXTERNALS:%=%_clean): %_clean:
        $(MAKE) -C $(ROOT_PATH)/$* clean
@@ -323,49 +397,65 @@ $(EXTERNALS:%=%_install): %_install:
 # Tools
 #
 tools:
-       $(MAKE) -C tools
+       $(MAKE) --silent -C tools
 
 tools_implib:
+       
+
+tools_test:
+       
 
 tools_clean:
        $(MAKE) -C tools clean
 
 tools_install:
 
-.PHONY: tools tools_implib tools_clean tools_install
+.PHONY: tools tools_implib tools_test tools_clean tools_install
 
 
 #
 # Developer Kits
 #
-dk:
-       $(RMKDIR) $(DK_PATH)
-       $(RMKDIR) $(DDK_PATH)
-       $(RMKDIR) $(DDK_PATH_LIB)
-       $(RMKDIR) $(DDK_PATH_INC)
-       $(RMKDIR) $(SDK_PATH)
-       $(RMKDIR) $(SDK_PATH_LIB)
-       $(RMKDIR) $(SDK_PATH_INC)
-       $(RMKDIR) $(XDK_PATH)
-       $(RMKDIR) $(XDK_PATH_LIB)
-       $(RMKDIR) $(XDK_PATH_INC)
+dk: tools
+       @$(RMKDIR) $(DK_PATH)
+       @$(RMKDIR) $(DDK_PATH)
+       @$(RMKDIR) $(DDK_PATH_LIB)
+       @$(RMKDIR) $(DDK_PATH_INC)
+       @$(RMKDIR) $(SDK_PATH)
+       @$(RMKDIR) $(SDK_PATH_LIB)
+       @$(RMKDIR) $(SDK_PATH_INC)
+       @$(RMKDIR) $(XDK_PATH)
+       @$(RMKDIR) $(XDK_PATH_LIB)
+#      @$(RMKDIR) $(XDK_PATH_INC)
 
 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:
@@ -377,43 +467,34 @@ dk_install:
 # Interfaces
 #
 iface_native:
-       $(MAKE) -C iface/native
+       $(MAKE) --silent -C tools/nci
 
 iface_native_implib:
-
+       
+iface_native_test:
+       
 iface_native_clean:
-       $(MAKE) -C iface/native clean
+       $(MAKE) --silent -C tools/nci clean
 
 iface_native_install:
 
 iface_native_bootcd:
 
-iface_additional:
-       $(MAKE) -C iface/addsys
-
-iface_additional_implib:
-
-iface_additional_clean:
-       $(MAKE) -C iface/addsys clean
-
-iface_additional_install:
-
-iface_additional_bootcd:
-
-.PHONY: iface_native iface_native_implib iface_native_clean iface_native_install \
-        iface_native_bootcd \
-        iface_additional iface_additional_implib iface_additional_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
 
 
 #
 # Bus driver rules
 #
-$(BUS): %:
+$(BUS): %: $(IMPLIB)
        $(MAKE) -C drivers/bus/$*
 
-$(BUS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/bus/$* implib
+$(BUS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/bus/$* implib
+
+$(BUS:%=%_test): %_test:
+       $(MAKE) -C drivers/bus/$* test
 
 $(BUS:%=%_clean): %_clean:
        $(MAKE) -C drivers/bus/$* clean
@@ -431,11 +512,14 @@ $(BUS:%=%_bootcd): %_bootcd:
 #
 # Driver support libraries rules
 #
-$(DRIVERS_LIB): %:
+$(DRIVERS_LIB): %: $(IMPLIB)
        $(MAKE) -C drivers/lib/$*
 
-$(DRIVERS_LIB:%=%_implib): %_implib:
-       $(MAKE) -C drivers/lib/$* implib
+$(DRIVERS_LIB:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/lib/$* implib
+
+$(DRIVERS_LIB:%=%_test): %_test:
+       $(MAKE) -C drivers/lib/$* test
 
 $(DRIVERS_LIB:%=%_clean): %_clean:
        $(MAKE) -C drivers/lib/$* clean
@@ -446,18 +530,21 @@ $(DRIVERS_LIB:%=%_install): %_install:
 $(DRIVERS_LIB:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/lib/$* bootcd
 
-.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \
-        $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd)
+.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_test) \
+        $(DRIVERS_LIB:%=%_clean) $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd)
 
 
 #
 # Device driver rules
 #
-$(DEVICE_DRIVERS): %:
+$(DEVICE_DRIVERS): %: $(IMPLIB)
        $(MAKE) -C drivers/dd/$*
 
-$(DEVICE_DRIVERS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/dd/$* implib
+$(DEVICE_DRIVERS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/dd/$* implib
+
+$(DEVICE_DRIVERS:%=%_test): %_test:
+       $(MAKE) -C drivers/dd/$* test
 
 $(DEVICE_DRIVERS:%=%_clean): %_clean:
        $(MAKE) -C drivers/dd/$* clean
@@ -468,18 +555,21 @@ $(DEVICE_DRIVERS:%=%_install): %_install:
 $(DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/dd/$* bootcd
 
-.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \
-        $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_bootcd)
+.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_test) \
+        $(DEVICE_DRIVERS:%=%_clean) $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_bootcd)
 
 
 #
 # Video device driver rules
 #
-VIDEO_DRIVERS: 
+VIDEO_DRIVERS: $(IMPLIB)
        $(MAKE) -C drivers/video
 
-VIDEO_DRIVERS_implib:
-       $(MAKE) -C drivers/video implib
+VIDEO_DRIVERS_implib: dk
+       $(MAKE) --silent -C drivers/video implib
+
+VIDEO_DRIVERS_test:
+       $(MAKE) -C drivers/video test
 
 VIDEO_DRIVERS_clean:
        $(MAKE) -C drivers/video clean
@@ -490,18 +580,45 @@ VIDEO_DRIVERS_install:
 VIDEO_DRIVERS_bootcd:
        $(MAKE) -C drivers/video bootcd
 
-.PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_clean \
-        VIDEO_DRIVERS_install 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
 #
-$(INPUT_DRIVERS): %:
+$(INPUT_DRIVERS): %: $(IMPLIB)
        $(MAKE) -C drivers/input/$*
 
-$(INPUT_DRIVERS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/input/$* implib
+$(INPUT_DRIVERS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/input/$* implib
+
+$(INPUT_DRIVERS:%=%_test): %_test:
+       $(MAKE) -C drivers/input/$* test
 
 $(INPUT_DRIVERS:%=%_clean): %_clean:
        $(MAKE) -C drivers/input/$* clean
@@ -512,17 +629,20 @@ $(INPUT_DRIVERS:%=%_install): %_install:
 $(INPUT_DRIVERS:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/input/$* bootcd
 
-.PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_clean)\
-        $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_bootcd)
+.PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_test) \
+        $(INPUT_DRIVERS:%=%_clean) $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_bootcd)
 
 #
 # Filesystem driver rules
 #
-$(FS_DRIVERS): %:
+$(FS_DRIVERS): %: $(IMPLIB)
        $(MAKE) -C drivers/fs/$*
 
-$(FS_DRIVERS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/fs/$* implib
+$(FS_DRIVERS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/fs/$* implib
+
+$(FS_DRIVERS:%=%_test): %_test:
+       $(MAKE) -C drivers/fs/$* test
 
 $(FS_DRIVERS:%=%_clean): %_clean:
        $(MAKE) -C drivers/fs/$* clean
@@ -533,18 +653,21 @@ $(FS_DRIVERS:%=%_install): %_install:
 $(FS_DRIVERS:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/fs/$* bootcd
 
-.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \
-        $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_bootcd)
+.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_test) \
+        $(FS_DRIVERS:%=%_clean) $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_bootcd)
 
 
 #
 # Network driver rules
 #
-$(NET_DRIVERS): %:
+$(NET_DRIVERS): %: $(IMPLIB)
        $(MAKE) -C drivers/net/$*
 
-$(NET_DRIVERS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/net/$* implib
+$(NET_DRIVERS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/net/$* implib
+
+$(NET_DRIVERS:%=%_test): %_test:
+       $(MAKE) -C drivers/net/$* test
 
 $(NET_DRIVERS:%=%_clean): %_clean:
        $(MAKE) -C drivers/net/$* clean
@@ -555,18 +678,21 @@ $(NET_DRIVERS:%=%_install): %_install:
 $(NET_DRIVERS:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/net/$* bootcd
 
-.PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_clean) \
-        $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_bootcd)
+.PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_test) \
+        $(NET_DRIVERS:%=%_clean) $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_bootcd)
 
 
 #
 # Network device driver rules
 #
-$(NET_DEVICE_DRIVERS): %:
+$(NET_DEVICE_DRIVERS): %: $(IMPLIB)
        $(MAKE) -C drivers/net/dd/$*
 
-$(NET_DEVICE_DRIVERS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/net/dd/$* implib
+$(NET_DEVICE_DRIVERS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/net/dd/$* implib
+
+$(NET_DEVICE_DRIVERS:%=%_test): %_test:
+       $(MAKE) -C drivers/net/dd/$* test
 
 $(NET_DEVICE_DRIVERS:%=%_clean): %_clean:
        $(MAKE) -C drivers/net/dd/$* clean
@@ -577,18 +703,22 @@ $(NET_DEVICE_DRIVERS:%=%_install): %_install:
 $(NET_DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/net/dd/$* bootcd
 
-.PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \
+.PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) \
+        $(NET_DEVICE_DRIVERS:%=%_implib) $(NET_DEVICE_DRIVERS:%=%_test) \
         $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_bootcd)
 
 
 #
 # storage driver rules
 #
-$(STORAGE_DRIVERS): %:
+$(STORAGE_DRIVERS): %: $(IMPLIB)
        $(MAKE) -C drivers/storage/$*
 
-$(STORAGE_DRIVERS:%=%_implib): %_implib:
-       $(MAKE) -C drivers/storage/$* implib
+$(STORAGE_DRIVERS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C drivers/storage/$* implib
+
+$(STORAGE_DRIVERS:%=%_test): %_test:
+       $(MAKE) -C drivers/storage/$* test
 
 $(STORAGE_DRIVERS:%=%_clean): %_clean:
        $(MAKE) -C drivers/storage/$* clean
@@ -599,35 +729,22 @@ $(STORAGE_DRIVERS:%=%_install): %_install:
 $(STORAGE_DRIVERS:%=%_bootcd): %_bootcd:
        $(MAKE) -C drivers/storage/$* bootcd
 
-.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) $(STORAGE_DRIVERS:%=%_implib) \
-               $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd)
-
-
-#
-# Kernel loaders
-#
-$(LOADERS): %:
-       $(MAKE) -C loaders/$*
-
-$(LOADERS:%=%_implib): %_implib:
-
-$(LOADERS:%=%_clean): %_clean:
-       $(MAKE) -C loaders/$* clean
-
-$(LOADERS:%=%_install): %_install:
-       $(MAKE) -C loaders/$* install
-
-.PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install)
+.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) \
+        $(STORAGE_DRIVERS:%=%_implib) $(STORAGE_DRIVERS:%=%_test) \
+        $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd)
 
 
 #
 # Required system components
 #
-ntoskrnl:
+ntoskrnl: bootstrap
        $(MAKE) -C ntoskrnl
 
-ntoskrnl_implib:
-       $(MAKE) -C ntoskrnl implib
+ntoskrnl_implib: dk
+       $(MAKE) --silent -C ntoskrnl implib
+
+ntoskrnl_test:
+       $(MAKE) -C ntoskrnl test
 
 ntoskrnl_clean:
        $(MAKE) -C ntoskrnl clean
@@ -638,17 +755,21 @@ ntoskrnl_install:
 ntoskrnl_bootcd:
        $(MAKE) -C ntoskrnl bootcd
 
-.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_bootcd
+.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_test \
+        ntoskrnl_clean ntoskrnl_install ntoskrnl_bootcd
 
 
 #
 # Hardware Abstraction Layer import library
 #
-hallib:
-       $(MAKE) -C hal/hal
+hallib: $(PATH_TO_TOP)/include/roscfg.h ntoskrnl_implib
+       $(MAKE) --silent -C hal/hal
+
+hallib_implib: dk ntoskrnl_implib
+       $(MAKE) --silent -C hal/hal implib
 
-hallib_implib:
-       $(MAKE) -C hal/hal implib
+hallib_test:
+       $(MAKE) -C hal/hal test
 
 hallib_clean:
        $(MAKE) -C hal/hal clean
@@ -659,17 +780,27 @@ hallib_install:
 hallib_bootcd:
        $(MAKE) -C hal/hal bootcd
 
-.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_bootcd
+.PHONY: hallib hallib_implib hallib_test hallib_clean \
+        hallib_install hallib_bootcd
 
 
 #
 # Hardware Abstraction Layers
 #
-$(HALS): %:
+ifeq ($(CONFIG_SMP),1)
+halx86: halx86/mp
+else
+halx86: halx86/up
+endif
+
+$(HALS): %: $(IMPLIB)
        $(MAKE) -C hal/$*
 
-$(HALS:%=%_implib): %_implib:
-       $(MAKE) -C hal/$* implib
+$(HALS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C hal/$* implib
+
+$(HALS:%=%_test): %_test:
+       $(MAKE) -C hal/$* test
 
 $(HALS:%=%_clean): %_clean:
        $(MAKE) -C hal/$* clean
@@ -680,20 +811,24 @@ $(HALS:%=%_install): %_install:
 $(HALS:%=%_bootcd): %_bootcd:
        $(MAKE) -C hal/$* bootcd
 
-.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_bootcd)
+.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_test) \
+        $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_bootcd)
 
 
 #
 # File system libraries
 #
-$(LIB_FSLIB): %:
+$(LIB_FSLIB): %: dk
        $(MAKE) -C lib/fslib/$*
 
 $(LIB_FSLIB:%=%_depends): %_depends:
        $(MAKE) -C lib/fslib/$* depends
 
-$(LIB_FSLIB:%=%_implib): %_implib:
-       $(MAKE) -C lib/fslib/$* implib
+$(LIB_FSLIB:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C lib/fslib/$* implib
+
+$(LIB_FSLIB:%=%_test): %_test:
+       $(MAKE) -C lib/fslib/$* test
 
 $(LIB_FSLIB:%=%_clean): %_clean:
        $(MAKE) -C lib/fslib/$* clean
@@ -704,21 +839,25 @@ $(LIB_FSLIB:%=%_install): %_install:
 $(LIB_FSLIB:%=%_bootcd): %_bootcd:
        $(MAKE) -C lib/fslib/$* bootcd
 
-.PHONY: $(LIB_FSLIB) $(LIB_FSLIB:%=%_depends) $(LIB_FSLIB:%=%_implib) $(LIB_FSLIB:%=%_clean) \
-       $(LIB_FSLIB:%=%_install) $(LIB_FSLIB:%=%_bootcd)
+.PHONY: $(LIB_FSLIB) $(LIB_FSLIB:%=%_depends) $(LIB_FSLIB:%=%_implib) \
+        $(LIB_FSLIB:%=%_test) $(LIB_FSLIB:%=%_clean) \
+        $(LIB_FSLIB:%=%_install) $(LIB_FSLIB:%=%_bootcd)
 
 
 #
 # Static libraries
 #
-$(LIB_STATIC): %:
-       $(MAKE) -C lib/$*
+$(LIB_STATIC): %: dk
+       $(MAKE) --silent -C lib/$*
 
 $(LIB_STATIC:%=%_depends): %_depends:
        $(MAKE) -C lib/string depends
 
-$(LIB_STATIC:%=%_implib): %_implib:
-       $(MAKE) -C lib/$* implib
+$(LIB_STATIC:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C lib/$* implib
+
+$(LIB_STATIC:%=%_test): %_test:
+       $(MAKE) -C lib/$* test
 
 $(LIB_STATIC:%=%_clean): %_clean:
        $(MAKE) -C lib/$* clean
@@ -729,21 +868,53 @@ $(LIB_STATIC:%=%_install): %_install:
 $(LIB_STATIC:%=%_bootcd): %_bootcd:
        $(MAKE) -C lib/$* bootcd
 
-.PHONY: $(LIB_STATIC) $(LIB_STATIC:%=%_depends) $(LIB_STATIC:%=%_implib) $(LIB_STATIC:%=%_clean) \
-       $(LIB_STATIC:%=%_install) $(LIB_STATIC:%=%_bootcd)
+.PHONY: $(LIB_STATIC) $(LIB_STATIC:%=%_depends) $(LIB_STATIC:%=%_implib) \
+        $(LIB_STATIC:%=%_test) $(LIB_STATIC:%=%_clean) \
+        $(LIB_STATIC:%=%_install) $(LIB_STATIC:%=%_bootcd)
+
+
+#
+# MSVCRT is seperate since CRTDLL depend on this
+#
+msvcrt: $(IMPLIB)
+       $(MAKE) -C lib/msvcrt
+
+msvcrt_depends:
+       $(MAKE) -C lib/msvcrt depends
+
+msvcrt_implib: dk
+       $(MAKE) --silent -C lib/msvcrt implib
+
+msvcrt_test:
+       $(MAKE) -C lib/msvcrt test
+
+msvcrt_clean:
+       $(MAKE) -C lib/msvcrt clean
+
+msvcrt_install:
+       $(MAKE) -C lib/msvcrt install
+
+msvcrt_bootcd:
+       $(MAKE) -C lib/msvcrt bootcd
+
+.PHONY: msvcrt msvcrt_depends msvcrt_implib msvcrt_test \
+        msvcrt_clean msvcrt_install msvcrt_bootcd
 
 
 #
 # DLLs
 #
-$(DLLS): %:
+$(DLLS): %: $(IMPLIB) msvcrt
        $(MAKE) -C lib/$*
 
 $(DLLS:%=%_depends): %_depends:
        $(MAKE) -C lib/$* depends
 
-$(DLLS:%=%_implib): %_implib:
-       $(MAKE) -C lib/$* implib
+$(DLLS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C lib/$* implib
+
+$(DLLS:%=%_test): %_test:
+       $(MAKE) -C lib/$* test
 
 $(DLLS:%=%_clean): %_clean:
        $(MAKE) -C lib/$* clean
@@ -754,21 +925,24 @@ $(DLLS:%=%_install): %_install:
 $(DLLS:%=%_bootcd): %_bootcd:
        $(MAKE) -C lib/$* bootcd
 
-.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) \
-        $(DLLS:%=%_bootcd)
+.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_test) \
+        $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_bootcd)
 
 
 #
 # Subsystem support modules
 #
-$(SUBSYS): %:
+$(SUBSYS): %: $(IMPLIB)
        $(MAKE) -C subsys/$*
 
 $(SUBSYS:%=%_depends): %_depends:
        $(MAKE) -C subsys/$* depends
 
-$(SUBSYS:%=%_implib): %_implib:
-       $(MAKE) -C subsys/$* implib
+$(SUBSYS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C subsys/$* implib
+
+$(SUBSYS:%=%_test): %_test:
+       $(MAKE) -C subsys/$* test
 
 $(SUBSYS:%=%_clean): %_clean:
        $(MAKE) -C subsys/$* clean
@@ -779,15 +953,18 @@ $(SUBSYS:%=%_install): %_install:
 $(SUBSYS:%=%_bootcd): %_bootcd:
        $(MAKE) -C subsys/$* bootcd
 
-.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
-        $(SUBSYS:%=%_bootcd)
+.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_test) \
+        $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) $(SUBSYS:%=%_bootcd)
 
 #
 # Regression testsuite
 #
 
-$(REGTESTS): %:
-       $(MAKE) -C regtests
+$(REGTESTS): %: $(IMPLIB)
+       $(MAKE) --silent -C regtests
+
+$(REGTESTS:%=%_implib): %_implib: dk
+       $(MAKE) --silent -C regtests implib
 
 $(REGTESTS:%=%_clean): %_clean:
        $(MAKE) -C regtests clean
@@ -803,43 +980,74 @@ $(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
+       $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/services to $(INSTALL_DIR)/system32/drivers/etc/services
+       $(CP) media/drivers/etc/services $(INSTALL_DIR)/system32/drivers/etc/services
+       $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/KDBinit to $(INSTALL_DIR)/system32/drivers/etc/KDBinit
+       $(CP) media/drivers/etc/KDBinit $(INSTALL_DIR)/system32/drivers/etc/KDBinit
 
 .PHONY: install_clean install_dirs install_before
 
@@ -878,6 +1086,4 @@ docu:
 
 .PHONY: docu
 
-
-# EOF
-
+include $(TOOLS_PATH)/config.mk