Replace direct calls to "make" with $(MAKE)
[reactos.git] / reactos / Makefile
index 3823556..7fd18d7 100644 (file)
@@ -5,25 +5,34 @@
 PATH_TO_TOP = .
 
 #
-# Define to build WINE modules
+# Define to build ReactOS external targets
 #
-ifeq ($(ROS_BUILD_WINE),)
-ROS_BUILD_WINE = no
+ifeq ($(ROS_BUILD_EXT),)
+ROS_BUILD_EXT = no
 else
-ROS_BUILD_WINE = yes
+ROS_BUILD_EXT = yes
 endif
 
 include $(PATH_TO_TOP)/rules.mak
 
-#
 # Required to run the system
-#
 COMPONENTS = iface_native iface_additional hallib ntoskrnl
+
+# Hardware Abstraction Layers
+# halx86
 HALS = halx86
+
+# Bus drivers
+# acpi isapnp pci
 BUS = acpi isapnp pci
-DLLS = ntdll kernel32 advapi32 crtdll msvcrt fmifs gdi32 msafd \
-       user32 secur32 ws2_32 version
-SUBSYS = smss win32k csrss
+
+# User mode libraries
+# advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
+# oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
+DLLS = advapi32 crtdll fmifs gdi32 kernel32 packet msafd msvcrt ntdll \
+       secur32 user32 version winedbgc ws2help ws2_32 wshirda #winmm 
+
+SUBSYS = smss win32k csrss ntvdm
 
 #
 # Select the server(s) you want to build
@@ -31,83 +40,85 @@ SUBSYS = smss win32k csrss
 #SERVERS = posix linux os2
 SERVERS = win32
 
-#
-# Select the loader(s) you want to build
-#
-#LOADERS = boot dos
+# Boot loaders
+# dos
 LOADERS = dos
 
-#
-# Select the device drivers and filesystems you want
-#
-#DEVICE_DRIVERS = beep floppy mouse sound test parallel serial
-DEVICE_DRIVERS = vidport vga blue ide null floppy
+# Driver support libraries
+#bzip2 zlib
+DRIVERS_LIB = bzip2 zlib
 
-#INPUT_DRIVERS = keyboard
+# Kernel mode device drivers
+# Obsolete: ide
+# beep blue floppy null parallel ramdrv serenum serial vga videoprt
+DEVICE_DRIVERS = beep blue floppy null serial vga videoprt
+
+# Kernel mode input drivers
+# keyboard mouclass psaux sermouse
 INPUT_DRIVERS = keyboard mouclass psaux
 
-#FS_DRIVERS = vfat minix ext2 template
-FS_DRIVERS = vfat ms np
+# Kernel mode file system drivers
+# cdfs ext2 fs_rec ms np vfat
+FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
 
-#NET_DRIVERS = ndis tdi tcpip tditest wshtcpip afd
-NET_DRIVERS = ndis tdi tcpip tditest wshtcpip afd
+# Kernel mode networking drivers
+# afd ndis npf tcpip tdi wshtcpip
+NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
 
-#NET_DEVICE_DRIVERS = ne2000
+# Kernel mode networking device drivers
+# ne2000
 NET_DEVICE_DRIVERS = ne2000
 
-#
-# storage drivers (don't change the order)
-#
-STORAGE_DRIVERS = class2 scsiport atapi disk
+# Kernel mode storage drivers
+# atapi cdrom class2 disk scsiport
+STORAGE_DRIVERS = atapi cdrom class2 disk scsiport
 
-#
-# system applications (required for startup)
-#
-#SYS_APPS = lsass services shell winlogon
-SYS_APPS = services shell winlogon
+# System applications
+# autochk lsass services shell winlogon
+SYS_APPS = autochk services shell winlogon gstart usetup
 
-APPS = args hello test cat bench apc shm lpc thread event file gditest \
-       pteb consume dump_shared_data vmtest regtest alive mstest nptest \
-       objdir atomtest winhello partinfo mutex readfile
+# System services
+# rpcss eventlog
+SYS_SVC = rpcss eventlog
 
-#NET_APPS = ncftp ping roshttpd telnet
-NET_APPS = ncftp ping roshttpd 
+APPS = tests testsets utils
 
-#lzexpand mapi32 (missing imports)
-#dsound (missing winmm.dll)
-WINE_DLLS = rpcrt4 ole32 oleaut32 oledlg olepro32 olecli olesvr \
-            shell32 shlwapi comctl32 shfolder shdocvw commdlg \
-            ddraw dinput dplay dplayx \
-            psapi richedit serialui winspool
 
-WINE_PROGS = clock cmdlgtst control notepad osversioncheck \
-             progman uninstaller view wcmd winefile winemine \
-             winver
+# External (sub)systems for ReactOS
+# rosapps wine posix os2 (requires c++) java (non-existant)
+EXTERNALS = rosapps wine posix os2
 
-ifeq ($(ROS_BUILD_WINE),yes)
-WINE_MODULES = $(WINE_DLLS) $(WINE_PROGS)
+ifeq ($(ROS_BUILD_EXT),yes)
+EXT_MODULES = $(EXTERNALS)
 else
-WINE_MODULES =
+EXT_MODULES =
 endif
 
-KERNEL_SERVICES = $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
+KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
        $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
 
 all: tools dk implib $(COMPONENTS) $(HALS) $(BUS) $(DLLS) $(SUBSYS) \
-     $(LOADERS) $(KERNEL_SERVICES) $(SYS_APPS) $(APPS) $(NET_APPS) \
-     $(WINE_MODULES)
+     $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \
+     $(APPS) $(EXT_MODULES)
+
+#config: $(TOOLS:%=%_config)
+
+depends: $(DLLS:%=%_depends) $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
+         $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
 
 implib: $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
         $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
-        $(KERNEL_SERVICES:%=%_implib) $(SUBSYS:%=%_implib) \
-        $(SYS_APPS:%=%_implib) $(APPS:%=%_implib) \
-        $(WINE_MODULES:%=%_implib)
+        $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
+        $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
+        $(APPS:%=%_implib) $(EXT_MODULES:%=%_implib)
 
-clean: dk_clean $(HALS:%=%_clean) \
+clean: tools dk_clean $(HALS:%=%_clean) \
        $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(DLLS:%=%_clean) \
-       $(LOADERS:%=%_clean) $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) \
-       $(SYS_APPS:%=%_clean) $(APPS:%=%_clean) $(NET_APPS:%=%_clean) \
-       $(WINE_MODULES:%=%_clean) clean_after tools_clean
+       $(LOADERS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) $(SUBSYS:%=%_clean) \
+       $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) \
+       $(NET_APPS:%=%_clean) \
+       $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) \
+       clean_after tools_clean
 
 clean_after:
        $(RM) $(PATH_TO_TOP)/include/roscfg.h
@@ -115,131 +126,122 @@ clean_after:
 install: tools install_dirs install_before \
          $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
          $(DLLS:%=%_install) $(LOADERS:%=%_install) \
-         $(KERNEL_SERVICES:%=%_install) $(SUBSYS:%=%_install) \
-         $(SYS_APPS:%=%_install) $(APPS:%=%_install) \
-         $(WINE_MODULES:%=%_install)
+         $(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \
+         $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
+         $(APPS:%=%_install) $(EXT_MODULES:%=%_install)
 
 dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
       $(HALS:%=%_dist) $(COMPONENTS:%=%_dist) $(BUS:%=%_dist) $(DLLS:%=%_dist) \
-      $(LOADERS:%=%_dist) $(KERNEL_SERVICES:%=%_dist) $(SUBSYS:%=%_dist) \
-      $(SYS_APPS:%=%_dist) $(APPS:%=%_dist) $(NET_APPS:%=%_dist) \
-      $(WINE_MODULES:%=%_dist)
+      $(LOADERS:%=%_dist) $(KERNEL_DRIVERS:%=%_dist) $(SUBSYS:%=%_dist) \
+      $(SYS_APPS:%=%_dist) $(SYS_SVC:%=%_dist) \
+      $(NET_APPS:%=%_dist) \
+      $(APPS:%=%_dist) $(EXT_MODULES:%=%_dist)
+
+.PHONY: all depends implib clean clean_before install dist
 
-.PHONY: all implib clean clean_before install dist
 
 #
 # System Applications
 #
 $(SYS_APPS): %:
-       make -C apps/system/$*
+       $(MAKE) -C subsys/system/$*
 
 $(SYS_APPS:%=%_implib): %_implib:
-       make -C apps/system/$* implib
+       $(MAKE) -C subsys/system/$* implib
 
 $(SYS_APPS:%=%_clean): %_clean:
-       make -C apps/system/$* clean
+       $(MAKE) -C subsys/system/$* clean
 
 $(SYS_APPS:%=%_dist): %_dist:
-       make -C apps/system/$* dist
+       $(MAKE) -C subsys/system/$* dist
 
 $(SYS_APPS:%=%_install): %_install:
-       make -C apps/system/$* install
+       $(MAKE) -C subsys/system/$* install
 
 .PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist)
 
 #
-# Applications
+# System Services
 #
-$(APPS): %:
-       make -C apps/$*
-
-$(APPS:%=%_implib): %_implib:
-       make -C apps/$* implib
-
-$(APPS:%=%_clean): %_clean:
-       make -C apps/$* clean
-
-$(APPS:%=%_dist): %_dist:
-       make -C apps/$* dist
+$(SYS_SVC): %:
+       $(MAKE) -C services/$*
 
-$(APPS:%=%_install): %_install:
-       make -C apps/$* install
+$(SYS_SVC:%=%_depends): %_depends:
+       $(MAKE) -C services/$* depends
 
-.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
+$(SYS_SVC:%=%_implib): %_implib:
+       $(MAKE) -C services/$* implib
 
-#
-# Network applications
-#
-$(NET_APPS): %:
-       make -C apps/net/$*
+$(SYS_SVC:%=%_clean): %_clean:
+       $(MAKE) -C services/$* clean
 
-$(NET_APPS:%=%_implib): %_implib:
-       make -C apps/net/$* implib
+$(SYS_SVC:%=%_dist): %_dist:
+       $(MAKE) -C services/$* dist
 
-$(NET_APPS:%=%_clean): %_clean:
-       make -C apps/net/$* clean
+$(SYS_SVC:%=%_install): %_install:
+       $(MAKE) -C services/$* install
 
-$(NET_APPS:%=%_dist): %_dist:
-       make -C apps/net/$* dist
-
-$(NET_APPS:%=%_install): %_install:
-       make -C apps/net/$* install
-
-.PHONY: $(NET_APPS) $(NET_APPS:%=%_implib) $(NET_APPS:%=%_clean) $(NET_APPS:%=%_install) $(NET_APPS:%=%_dist)
+.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install) $(SYS_SVC:%=%_dist)
 
 
 #
-# Wine DLLs
+# Applications
+#
+#
+# Extra (optional system) Applications
 #
-$(WINE_DLLS): %:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$*
+$(APPS): %:
+       $(MAKE) -C apps/$*
 
-$(WINE_DLLS:%=%_implib): %_implib:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* implib
+$(APPS:%=%_implib): %_implib:
+       $(MAKE) -C apps/$* implib
 
-$(WINE_DLLS:%=%_clean): %_clean:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* clean
+$(APPS:%=%_clean): %_clean:
+       $(MAKE) -C apps/$* clean
 
-$(WINE_DLLS:%=%_dist): %_dist:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* dist
+$(APPS:%=%_dist): %_dist:
+       $(MAKE) -C apps/$* dist
 
-$(WINE_DLLS:%=%_install): %_install:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* install
+$(APPS:%=%_install): %_install:
+       $(MAKE) -C apps/$* install
 
-.PHONY: $(WINE_DLLS) $(WINE_DLLS:%=%_implib) $(WINE_DLLS:%=%_clean) $(WINE_DLLS:%=%_install) $(WINE_DLLS:%=%_dist)
+.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
 
 
 #
-# Wine programs
+# External ports and subsystem personalities
 #
-$(WINE_PROGS): %:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$*
+$(EXTERNALS): %:
+       $(MAKE) -C $(ROOT_PATH)/$*
+
+$(EXTERNALS:%=%_depends): %_depends:
+       $(MAKE) -C $(ROOT_PATH)/$* depends
 
-$(WINE_PROGS:%=%_implib): %_implib:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* implib
+$(EXTERNALS:%=%_implib): %_implib:
+       $(MAKE) -C $(ROOT_PATH)/$* implib
 
-$(WINE_PROGS:%=%_clean): %_clean:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* clean
+$(EXTERNALS:%=%_clean): %_clean:
+       $(MAKE) -C $(ROOT_PATH)/$* clean
 
-$(WINE_PROGS:%=%_dist): %_dist:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* dist
+$(EXTERNALS:%=%_dist): %_dist:
+       $(MAKE) -C $(ROOT_PATH)/$* dist
 
-$(WINE_PROGS:%=%_install): %_install:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* install
+$(EXTERNALS:%=%_install): %_install:
+       $(MAKE) -C $(ROOT_PATH)/$* install
 
-.PHONY: $(WINE_PROGS) $(WINE_PROGS:%=%_implib) $(WINE_PROGS:%=%_clean) $(WINE_PROGS:%=%_install) $(WINE_PROGS:%=%_dist)
+.PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install) $(EXTERNALS:%=%_dist)
 
 
 #
 # Tools
 #
 tools:
-       make -C tools
+       $(MAKE) -C tools
 
 tools_implib:
 
 tools_clean:
-       make -C tools clean
+       $(MAKE) -C tools clean
 
 tools_install:
 
@@ -292,24 +294,24 @@ dk_dist:
 # Interfaces
 #
 iface_native:
-       make -C iface/native
+       $(MAKE) -C iface/native
 
 iface_native_implib:
 
 iface_native_clean:
-       make -C iface/native clean
+       $(MAKE) -C iface/native clean
 
 iface_native_install:
 
 iface_native_dist:
 
 iface_additional:
-       make -C iface/addsys
+       $(MAKE) -C iface/addsys
 
 iface_additional_implib:
 
 iface_additional_clean:
-       make -C iface/addsys clean
+       $(MAKE) -C iface/addsys clean
 
 iface_additional_install:
 
@@ -324,40 +326,61 @@ iface_additional_dist:
 # Bus driver rules
 #
 $(BUS): %:
-       make -C services/bus/$*
+       $(MAKE) -C drivers/bus/$*
 
 $(BUS:%=%_implib): %_implib:
-       make -C services/bus/$* implib
+       $(MAKE) -C drivers/bus/$* implib
 
 $(BUS:%=%_clean): %_clean:
-       make -C services/bus/$* clean
+       $(MAKE) -C drivers/bus/$* clean
 
 $(BUS:%=%_install): %_install:
-       make -C services/bus/$* install
+       $(MAKE) -C drivers/bus/$* install
 
 $(BUS:%=%_dist): %_dist:
-       make -C services/bus/$* dist
+       $(MAKE) -C drivers/bus/$* dist
 
 .PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
         $(BUS:%=%_install) $(BUS:%=%_dist)
 
+#
+# Driver support libraries rules
+#
+$(DRIVERS_LIB): %:
+       $(MAKE) -C drivers/lib/$*
+
+$(DRIVERS_LIB:%=%_implib): %_implib:
+       $(MAKE) -C drivers/lib/$* implib
+
+$(DRIVERS_LIB:%=%_clean): %_clean:
+       $(MAKE) -C drivers/lib/$* clean
+
+$(DRIVERS_LIB:%=%_install): %_install:
+       $(MAKE) -C drivers/lib/$* install
+
+$(DRIVERS_LIB:%=%_dist): %_dist:
+       $(MAKE) -C drivers/lib/$* dist
+
+.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \
+        $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_dist)
+
 #
 # Device driver rules
 #
 $(DEVICE_DRIVERS): %:
-       make -C services/dd/$*
+       $(MAKE) -C drivers/dd/$*
 
 $(DEVICE_DRIVERS:%=%_implib): %_implib:
-       make -C services/dd/$* implib
+       $(MAKE) -C drivers/dd/$* implib
 
 $(DEVICE_DRIVERS:%=%_clean): %_clean:
-       make -C services/dd/$* clean
+       $(MAKE) -C drivers/dd/$* clean
 
 $(DEVICE_DRIVERS:%=%_install): %_install:
-       make -C services/dd/$* install
+       $(MAKE) -C drivers/dd/$* install
 
 $(DEVICE_DRIVERS:%=%_dist): %_dist:
-       make -C services/dd/$* dist
+       $(MAKE) -C drivers/dd/$* dist
 
 .PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \
         $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_dist)
@@ -366,37 +389,37 @@ $(DEVICE_DRIVERS:%=%_dist): %_dist:
 # Input driver rules
 #
 $(INPUT_DRIVERS): %:
-       make -C services/input/$*
+       $(MAKE) -C drivers/input/$*
 
 $(INPUT_DRIVERS:%=%_implib): %_implib:
-       make -C services/input/$* implib
+       $(MAKE) -C drivers/input/$* implib
 
 $(INPUT_DRIVERS:%=%_clean): %_clean:
-       make -C services/input/$* clean
+       $(MAKE) -C drivers/input/$* clean
 
 $(INPUT_DRIVERS:%=%_install): %_install:
-       make -C services/input/$* install
+       $(MAKE) -C drivers/input/$* install
 
 $(INPUT_DRIVERS:%=%_dist): %_dist:
-       make -C services/input/$* dist
+       $(MAKE) -C drivers/input/$* dist
 
 .PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_clean)\
         $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_dist)
 
 $(FS_DRIVERS): %:
-       make -C services/fs/$*
+       $(MAKE) -C drivers/fs/$*
 
 $(FS_DRIVERS:%=%_implib): %_implib:
-       make -C services/fs/$* implib
+       $(MAKE) -C drivers/fs/$* implib
 
 $(FS_DRIVERS:%=%_clean): %_clean:
-       make -C services/fs/$* clean
+       $(MAKE) -C drivers/fs/$* clean
 
 $(FS_DRIVERS:%=%_install): %_install:
-       make -C services/fs/$* install
+       $(MAKE) -C drivers/fs/$* install
 
 $(FS_DRIVERS:%=%_dist): %_dist:
-       make -C services/fs/$* dist
+       $(MAKE) -C drivers/fs/$* dist
 
 .PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \
         $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_dist)
@@ -405,37 +428,37 @@ $(FS_DRIVERS:%=%_dist): %_dist:
 # Network driver rules
 #
 $(NET_DRIVERS): %:
-       make -C services/net/$*
+       $(MAKE) -C drivers/net/$*
 
 $(NET_DRIVERS:%=%_implib): %_implib:
-       make -C services/net/$* implib
+       $(MAKE) -C drivers/net/$* implib
 
 $(NET_DRIVERS:%=%_clean): %_clean:
-       make -C services/net/$* clean
+       $(MAKE) -C drivers/net/$* clean
 
 $(NET_DRIVERS:%=%_install): %_install:
-       make -C services/net/$* install
+       $(MAKE) -C drivers/net/$* install
 
 $(NET_DRIVERS:%=%_dist): %_dist:
-       make -C services/net/$* dist
+       $(MAKE) -C drivers/net/$* dist
 
 .PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_clean) \
         $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_dist)
 
 $(NET_DEVICE_DRIVERS): %:
-       make -C services/net/dd/$*
+       $(MAKE) -C drivers/net/dd/$*
 
 $(NET_DEVICE_DRIVERS:%=%_implib): %_implib:
-       make -C services/net/dd/$* implib
+       $(MAKE) -C drivers/net/dd/$* implib
 
 $(NET_DEVICE_DRIVERS:%=%_clean): %_clean:
-       make -C services/net/dd/$* clean
+       $(MAKE) -C drivers/net/dd/$* clean
 
 $(NET_DEVICE_DRIVERS:%=%_install): %_install:
-       make -C services/net/dd/$* install
+       $(MAKE) -C drivers/net/dd/$* install
 
 $(NET_DEVICE_DRIVERS:%=%_dist): %_dist:
-       make -C services/net/dd/$* dist
+       $(MAKE) -C drivers/net/dd/$* dist
 
 .PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \
         $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist)
@@ -444,19 +467,19 @@ $(NET_DEVICE_DRIVERS:%=%_dist): %_dist:
 # storage driver rules
 #
 $(STORAGE_DRIVERS): %:
-       make -C services/storage/$*
+       $(MAKE) -C drivers/storage/$*
 
 $(STORAGE_DRIVERS:%=%_implib): %_implib:
-       make -C services/storage/$* implib
+       $(MAKE) -C drivers/storage/$* implib
 
 $(STORAGE_DRIVERS:%=%_clean): %_clean:
-       make -C services/storage/$* clean
+       $(MAKE) -C drivers/storage/$* clean
 
 $(STORAGE_DRIVERS:%=%_install): %_install:
-       make -C services/storage/$* install
+       $(MAKE) -C drivers/storage/$* install
 
 $(STORAGE_DRIVERS:%=%_dist): %_dist:
-       make -C services/storage/$* dist
+       $(MAKE) -C drivers/storage/$* dist
 
 .PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) \
         $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_dist)
@@ -466,18 +489,18 @@ $(STORAGE_DRIVERS:%=%_dist): %_dist:
 #
 
 $(LOADERS): %:
-       make -C loaders/$*
+       $(MAKE) -C loaders/$*
 
 $(LOADERS:%=%_implib): %_implib:
 
 $(LOADERS:%=%_clean): %_clean:
-       make -C loaders/$* clean
+       $(MAKE) -C loaders/$* clean
 
 $(LOADERS:%=%_install): %_install:
-       make -C loaders/$* install
+       $(MAKE) -C loaders/$* install
 
 $(LOADERS:%=%_dist): %_dist:
-       make -C loaders/$* dist
+       $(MAKE) -C loaders/$* dist
 
 .PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install) \
         $(LOADERS:%=%_dist)
@@ -487,19 +510,19 @@ $(LOADERS:%=%_dist): %_dist:
 #
 
 ntoskrnl:
-       make -C ntoskrnl
+       $(MAKE) -C ntoskrnl
 
 ntoskrnl_implib:
-       make -C ntoskrnl implib
+       $(MAKE) -C ntoskrnl implib
 
 ntoskrnl_clean:
-       make -C ntoskrnl clean
+       $(MAKE) -C ntoskrnl clean
 
 ntoskrnl_install:
-       make -C ntoskrnl install
+       $(MAKE) -C ntoskrnl install
 
 ntoskrnl_dist:
-       make -C ntoskrnl dist
+       $(MAKE) -C ntoskrnl dist
 
 .PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
 
@@ -508,19 +531,19 @@ ntoskrnl_dist:
 #
 
 hallib:
-       make -C hal/hal
+       $(MAKE) -C hal/hal
 
 hallib_implib:
-       make -C hal/hal implib
+       $(MAKE) -C hal/hal implib
 
 hallib_clean:
-       make -C hal/hal clean
+       $(MAKE) -C hal/hal clean
 
 hallib_install:
-       make -C hal/hal install
+       $(MAKE) -C hal/hal install
 
 hallib_dist:
-       make -C hal/hal dist
+       $(MAKE) -C hal/hal dist
 
 .PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist
 
@@ -529,19 +552,19 @@ hallib_dist:
 #
 
 $(HALS): %:
-       make -C hal/$*
+       $(MAKE) -C hal/$*
 
 $(HALS:%=%_implib): %_implib:
-       make -C hal/$* implib
+       $(MAKE) -C hal/$* implib
 
 $(HALS:%=%_clean): %_clean:
-       make -C hal/$* clean
+       $(MAKE) -C hal/$* clean
 
 $(HALS:%=%_install): %_install:
-       make -C hal/$* install
+       $(MAKE) -C hal/$* install
 
 $(HALS:%=%_dist): %_dist:
-       make -C hal/$* dist
+       $(MAKE) -C hal/$* dist
 
 .PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist)
 
@@ -550,42 +573,48 @@ $(HALS:%=%_dist): %_dist:
 #
 
 $(DLLS): %:
-       make -C lib/$*
+       $(MAKE) -C lib/$*
+
+$(DLLS:%=%_depends): %_depends:
+       $(MAKE) -C lib/$* depends
 
 $(DLLS:%=%_implib): %_implib:
-       make -C lib/$* implib
+       $(MAKE) -C lib/$* implib
 
 $(DLLS:%=%_clean): %_clean:
-       make -C lib/$* clean
+       $(MAKE) -C lib/$* clean
 
 $(DLLS:%=%_install): %_install:
-       make -C lib/$* install
+       $(MAKE) -C lib/$* install
 
 $(DLLS:%=%_dist): %_dist:
-       make -C lib/$* dist
+       $(MAKE) -C lib/$* dist
 
-.PHONY: $(DLLS) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_dist)
+.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_dist)
 
 #
-# Kernel Subsystems
+# Subsystem support modules
 #
 
 $(SUBSYS): %:
-       make -C subsys/$*
+       $(MAKE) -C subsys/$*
+
+$(SUBSYS:%=%_depends): %_depends:
+       $(MAKE) -C subsys/$* depends
 
 $(SUBSYS:%=%_implib): %_implib:
-       make -C subsys/$* implib
+       $(MAKE) -C subsys/$* implib
 
 $(SUBSYS:%=%_clean): %_clean:
-       make -C subsys/$* clean
+       $(MAKE) -C subsys/$* clean
 
 $(SUBSYS:%=%_install): %_install:
-       make -C subsys/$* install
+       $(MAKE) -C subsys/$* install
 
 $(SUBSYS:%=%_dist): %_dist:
-       make -C subsys/$* dist
+       $(MAKE) -C subsys/$* dist
 
-.PHONY: $(SUBSYS) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
+.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
         $(SUBSYS:%=%_dist)
 
 #
@@ -622,9 +651,10 @@ install_dirs:
        $(RMKDIR) $(INSTALL_DIR)/system32/drivers
 
 install_before:
+       $(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
        $(CP) boot.bat $(INSTALL_DIR)/boot.bat
        $(CP) aboot.bat $(INSTALL_DIR)/aboot.bat
-       $(CP) boot.hiv $(INSTALL_DIR)/system32/boot.hiv
+       $(CP) system.hiv $(INSTALL_DIR)/system32/config/system.hiv
        $(CP) media/fonts/helb____.ttf $(INSTALL_DIR)/media/fonts/helb____.ttf
        $(CP) media/fonts/timr____.ttf $(INSTALL_DIR)/media/fonts/timr____.ttf
 
@@ -664,3 +694,4 @@ etags:
        find . -name "*.[ch]" -print | etags --language=c -
 
 # EOF
+