Replace direct calls to "make" with $(MAKE)
[reactos.git] / reactos / Makefile
index f20fcdf..7fd18d7 100644 (file)
 # Global makefile
 #
 
+PATH_TO_TOP = .
+
 #
-# Select your host
+# Define to build ReactOS external targets
 #
-#HOST = mingw32-linux
-#HOST = mingw32-windows
+ifeq ($(ROS_BUILD_EXT),)
+ROS_BUILD_EXT = no
+else
+ROS_BUILD_EXT = yes
+endif
 
-include rules.mak
+include $(PATH_TO_TOP)/rules.mak
 
-#
 # Required to run the system
-#
-COMPONENTS = iface_native iface_additional ntoskrnl
-DLLS = ntdll kernel32 crtdll advapi32 fmifs gdi32 secur32 user32 ws2_32
-SUBSYS = smss win32k csrss
+COMPONENTS = iface_native iface_additional hallib ntoskrnl
+
+# Hardware Abstraction Layers
+# halx86
+HALS = halx86
+
+# Bus drivers
+# acpi isapnp pci
+BUS = acpi isapnp pci
+
+# 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
 #
+#SERVERS = posix linux os2
 SERVERS = win32
-# SERVERS = posix linux os2
 
-#
-# Select the loader(s) you want to build
-#
+# Boot loaders
+# dos
 LOADERS = dos
-# LOADERS = boot
 
-#
-# Select the device drivers and filesystems you want
-#
-DEVICE_DRIVERS = vidport vga blue ide null floppy
-# DEVICE_DRIVERS = beep event floppy ide_test mouse sound test test1 parallel serial
+# 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
 
-FS_DRIVERS = vfat minix
-# FS_DRIVERS = minix ext2 template
+# Kernel mode input drivers
+# keyboard mouclass psaux sermouse
+INPUT_DRIVERS = keyboard mouclass psaux
 
-# ndis tdi tcpip tditest wshtcpip
-NET_DRIVERS = ndis tcpip tditest wshtcpip
+# Kernel mode file system drivers
+# cdfs ext2 fs_rec ms np vfat
+FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
 
+# Kernel mode networking drivers
+# afd ndis npf tcpip tdi wshtcpip
+NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
+
+# Kernel mode networking device drivers
 # ne2000
 NET_DEVICE_DRIVERS = ne2000
 
-#
-# system applications (required for startup)
-#
-SYS_APPS = shell winlogon services
-
-APPS = args hello test cat bench apc shm lpc thread event file gditest \
-       pteb consume dump_shared_data vmtest regtest
+# Kernel mode storage drivers
+# atapi cdrom class2 disk scsiport
+STORAGE_DRIVERS = atapi cdrom class2 disk scsiport
 
-#       objdir
+# System applications
+# autochk lsass services shell winlogon
+SYS_APPS = autochk services shell winlogon gstart usetup
 
-# ping
-NET_APPS = ping
+# System services
+# rpcss eventlog
+SYS_SVC = rpcss eventlog
 
+APPS = tests testsets utils
 
-KERNEL_SERVICES = $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) $(NET_DRIVERS) $(NET_DEVICE_DRIVERS)
 
-all: buildno $(COMPONENTS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(SYS_APPS) $(APPS) $(NET_APPS)
+# External (sub)systems for ReactOS
+# rosapps wine posix os2 (requires c++) java (non-existant)
+EXTERNALS = rosapps wine posix os2
 
-.PHONY: all
-
-clean: buildno_clean $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \
-       $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(APPS:%=%_clean)
+ifeq ($(ROS_BUILD_EXT),yes)
+EXT_MODULES = $(EXTERNALS)
+else
+EXT_MODULES =
+endif
 
-.PHONY: clean
+KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
+       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
 
-ifeq ($(HOST),mingw32-linux)
-rcopy$(EXE_POSTFIX): rcopy.c
-       $(HOST_CC) -g -DUNIX_PATHS rcopy.c -o rcopy$(EXE_POSTFIX)
-endif
-ifeq ($(HOST),mingw32-windows)
-rcopy$(EXE_POSTFIX): rcopy.c
-       $(HOST_CC) -g -DDOS_PATHS rcopy.c -o rcopy$(EXE_POSTFIX)
-endif
+all: tools dk implib $(COMPONENTS) $(HALS) $(BUS) $(DLLS) $(SUBSYS) \
+     $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \
+     $(APPS) $(EXT_MODULES)
 
-ifeq ($(HOST),mingw32-linux)
-rmkdir$(EXE_POSTFIX): rmkdir.c
-       $(HOST_CC) -g -DUNIX_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX)
-endif
-ifeq ($(HOST),mingw32-windows)
-rmkdir$(EXE_POSTFIX): rmkdir.c
-       $(HOST_CC) -g -DDOS_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX)
-endif
+#config: $(TOOLS:%=%_config)
 
+depends: $(DLLS:%=%_depends) $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
+         $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
 
-install: rcopy$(EXE_POSTFIX) rmkdir$(EXE_POSTFIX) make_install_dirs autoexec_install $(COMPONENTS:%=%_install) \
-        $(DLLS:%=%_install) $(LOADERS:%=%_install) \
-        $(KERNEL_SERVICES:%=%_install) $(SUBSYS:%=%_install) \
-        $(SYS_APPS:%=%_install) $(APPS:%=%_install)
+implib: $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
+        $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
+        $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
+        $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
+        $(APPS:%=%_implib) $(EXT_MODULES:%=%_implib)
 
-dist: rcopy$(EXE_POSTFIX) clean_dist_dir make_dist_dirs $(COMPONENTS:%=%_dist) $(DLLS:%=%_dist) \
-      $(LOADERS:%=%_dist) $(KERNEL_SERVICES:%=%_dist) $(SUBSYS:%=%_dist) \
-      $(SYS_APPS:%=%_dist) $(APPS:%=%_dist)
+clean: tools dk_clean $(HALS:%=%_clean) \
+       $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(DLLS:%=%_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
 
-#
-# Build number generator
-#
-buildno: include/reactos/version.h
-       make -C apps/buildno
+clean_after:
+       $(RM) $(PATH_TO_TOP)/include/roscfg.h
 
-buildno_clean:
-       make -C apps/buildno clean
+install: tools install_dirs install_before \
+         $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
+         $(DLLS:%=%_install) $(LOADERS:%=%_install) \
+         $(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \
+         $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
+         $(APPS:%=%_install) $(EXT_MODULES:%=%_install)
 
-buildno_dist:
+dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
+      $(HALS:%=%_dist) $(COMPONENTS:%=%_dist) $(BUS:%=%_dist) $(DLLS:%=%_dist) \
+      $(LOADERS:%=%_dist) $(KERNEL_DRIVERS:%=%_dist) $(SUBSYS:%=%_dist) \
+      $(SYS_APPS:%=%_dist) $(SYS_SVC:%=%_dist) \
+      $(NET_APPS:%=%_dist) \
+      $(APPS:%=%_dist) $(EXT_MODULES:%=%_dist)
 
-buildno_install:
+.PHONY: all depends implib clean clean_before install dist
 
-.PHONY: buildno buildno_clean buildno_dist buildno_install
 
 #
 # System Applications
 #
 $(SYS_APPS): %:
-       make -C apps/system/$*
+       $(MAKE) -C subsys/system/$*
+
+$(SYS_APPS:%=%_implib): %_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)
+
+#
+# System Services
+#
+$(SYS_SVC): %:
+       $(MAKE) -C services/$*
+
+$(SYS_SVC:%=%_depends): %_depends:
+       $(MAKE) -C services/$* depends
+
+$(SYS_SVC:%=%_implib): %_implib:
+       $(MAKE) -C services/$* implib
+
+$(SYS_SVC:%=%_clean): %_clean:
+       $(MAKE) -C services/$* clean
+
+$(SYS_SVC:%=%_dist): %_dist:
+       $(MAKE) -C services/$* dist
+
+$(SYS_SVC:%=%_install): %_install:
+       $(MAKE) -C services/$* install
+
+.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install) $(SYS_SVC:%=%_dist)
 
-.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist)
 
 #
 # Applications
 #
+#
+# Extra (optional system) Applications
+#
 $(APPS): %:
-       make -C apps/$*
+       $(MAKE) -C apps/$*
+
+$(APPS:%=%_implib): %_implib:
+       $(MAKE) -C apps/$* implib
 
 $(APPS:%=%_clean): %_clean:
-       make -C apps/$* clean
+       $(MAKE) -C apps/$* clean
 
 $(APPS:%=%_dist): %_dist:
-       make -C apps/$* dist
+       $(MAKE) -C apps/$* dist
 
 $(APPS:%=%_install): %_install:
-       make -C apps/$* install
+       $(MAKE) -C apps/$* install
+
+.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
+
+
+#
+# External ports and subsystem personalities
+#
+$(EXTERNALS): %:
+       $(MAKE) -C $(ROOT_PATH)/$*
+
+$(EXTERNALS:%=%_depends): %_depends:
+       $(MAKE) -C $(ROOT_PATH)/$* depends
+
+$(EXTERNALS:%=%_implib): %_implib:
+       $(MAKE) -C $(ROOT_PATH)/$* implib
+
+$(EXTERNALS:%=%_clean): %_clean:
+       $(MAKE) -C $(ROOT_PATH)/$* clean
+
+$(EXTERNALS:%=%_dist): %_dist:
+       $(MAKE) -C $(ROOT_PATH)/$* dist
+
+$(EXTERNALS:%=%_install): %_install:
+       $(MAKE) -C $(ROOT_PATH)/$* install
+
+.PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install) $(EXTERNALS:%=%_dist)
+
+
+#
+# Tools
+#
+tools:
+       $(MAKE) -C tools
+
+tools_implib:
+
+tools_clean:
+       $(MAKE) -C tools clean
+
+tools_install:
+
+tools_dist:
+
+.PHONY: tools tools_implib tools_clean tools_install tools_dist
 
-.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
 
 #
-# Network applications
+# Developer Kits
 #
-$(NET_APPS): %:
-       make -C apps/net/$*
+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_implib:
 
-$(NET_APPS:%=%_clean): %_clean:
-       make -C apps/net/$* clean
+# WARNING! Be very sure that there are no important files
+#          in these directories before cleaning them!!!
+dk_clean:
+       $(RM) $(DDK_PATH_LIB)/*.a
+# $(RM) $(DDK_PATH_INC)/*.h
+       $(RMDIR) $(DDK_PATH_LIB)
+#      $(RMDIR) $(DDK_PATH_INC)
+       $(RM) $(SDK_PATH_LIB)/*.a
+# $(RM) $(SDK_PATH_INC)/*.h
+       $(RMDIR) $(SDK_PATH_LIB)
+#      $(RMDIR) $(SDK_PATH_INC)
+       $(RM) $(XDK_PATH_LIB)/*.a
+#      $(RM) $(XDK_PATH_INC)/*.h
+       $(RMDIR) $(XDK_PATH_LIB)
+#      $(RMDIR) $(XDK_PATH_INC)
 
-$(NET_APPS:%=%_dist): %_dist:
-       make -C apps/net/$* dist
+dk_install:
 
-$(NET_APPS:%=%_install): %_install:
-       make -C apps/net/$* install
+dk_dist:
+
+.PHONY: dk dk_implib dk_clean dk_install dk_dist
 
-.PHONY: $(NET_APPS) $(NET_APPS:%=%_clean) $(NET_APPS:%=%_install) $(NET_APPS:%=%_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:
 
 iface_additional_dist:
 
-.PHONY: iface_native iface_native_clean iface_native_install \
+.PHONY: iface_native iface_native_implib iface_native_clean iface_native_install \
         iface_native_dist \
-        iface_additional iface_additional_clean iface_additional_install \
-        iface_additional_dist
+        iface_additional iface_additional_implib iface_additional_clean \
+        iface_additional_install iface_additional_dist
+
+#
+# Bus driver rules
+#
+$(BUS): %:
+       $(MAKE) -C drivers/bus/$*
+
+$(BUS:%=%_implib): %_implib:
+       $(MAKE) -C drivers/bus/$* implib
+
+$(BUS:%=%_clean): %_clean:
+       $(MAKE) -C drivers/bus/$* clean
+
+$(BUS:%=%_install): %_install:
+       $(MAKE) -C drivers/bus/$* install
+
+$(BUS:%=%_dist): %_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 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:%=%_clean) \
+.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \
         $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_dist)
 
 #
 # Input driver rules
 #
 $(INPUT_DRIVERS): %:
-       make -C services/input/$*
+       $(MAKE) -C drivers/input/$*
+
+$(INPUT_DRIVERS:%=%_implib): %_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:%=%_clean) \
+.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 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:%=%_clean) $(FS_DRIVERS:%=%_install) \
-        $(FS_DRIVERS:%=%_dist)
+.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \
+        $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_dist)
 
+#
+# Network driver rules
+#
 $(NET_DRIVERS): %:
-       make -C services/net/$*
+       $(MAKE) -C drivers/net/$*
+
+$(NET_DRIVERS:%=%_implib): %_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:%=%_clean) $(NET_DRIVERS:%=%_install) \
-        $(NET_DRIVERS:%=%_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 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) \
+.PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \
         $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist)
 
+#
+# storage driver rules
+#
+$(STORAGE_DRIVERS): %:
+       $(MAKE) -C drivers/storage/$*
+
+$(STORAGE_DRIVERS:%=%_implib): %_implib:
+       $(MAKE) -C drivers/storage/$* implib
+
+$(STORAGE_DRIVERS:%=%_clean): %_clean:
+       $(MAKE) -C drivers/storage/$* clean
+
+$(STORAGE_DRIVERS:%=%_install): %_install:
+       $(MAKE) -C drivers/storage/$* install
+
+$(STORAGE_DRIVERS:%=%_dist): %_dist:
+       $(MAKE) -C drivers/storage/$* dist
+
+.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) \
+        $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_dist)
+
 #
 # Kernel loaders
 #
 
 $(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:%=%_clean) $(LOADERS:%=%_install) \
+.PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install) \
         $(LOADERS:%=%_dist)
 
 #
@@ -298,106 +510,188 @@ $(LOADERS:%=%_dist): %_dist:
 #
 
 ntoskrnl:
-       make -C ntoskrnl
+       $(MAKE) -C ntoskrnl
+
+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_clean ntoskrnl_install ntoskrnl_dist
+.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
+
+#
+# Hardware Abstraction Layer import library
+#
+
+hallib:
+       $(MAKE) -C hal/hal
+
+hallib_implib:
+       $(MAKE) -C hal/hal implib
+
+hallib_clean:
+       $(MAKE) -C hal/hal clean
+
+hallib_install:
+       $(MAKE) -C hal/hal install
+
+hallib_dist:
+       $(MAKE) -C hal/hal dist
+
+.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist
+
+#
+# Hardware Abstraction Layers
+#
+
+$(HALS): %:
+       $(MAKE) -C hal/$*
+
+$(HALS:%=%_implib): %_implib:
+       $(MAKE) -C hal/$* implib
+
+$(HALS:%=%_clean): %_clean:
+       $(MAKE) -C hal/$* clean
+
+$(HALS:%=%_install): %_install:
+       $(MAKE) -C hal/$* install
+
+$(HALS:%=%_dist): %_dist:
+       $(MAKE) -C hal/$* dist
+
+.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist)
 
 #
 # Required DLLs
 #
 
 $(DLLS): %:
-       make -C lib/$*
+       $(MAKE) -C lib/$*
+
+$(DLLS:%=%_depends): %_depends:
+       $(MAKE) -C lib/$* depends
+
+$(DLLS:%=%_implib): %_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:%=%_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
 
 $(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:%=%_clean) $(SUBSYS:%=%_install) \
+.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
         $(SUBSYS:%=%_dist)
 
 #
-# Make an install floppy
-#
-make_install_dirs:
-       ./rmkdir $(FLOPPY_DIR)/dlls
-       ./rmkdir $(FLOPPY_DIR)/apps
-       ./rmkdir $(FLOPPY_DIR)/drivers
-       ./rmkdir $(FLOPPY_DIR)/subsys
-
-
-.PHONY: make_install_dirs
+# Create an installation
+#
+
+install_clean:
+       $(RM) $(INSTALL_DIR)/system32/drivers/*.*
+       $(RM) $(INSTALL_DIR)/system32/config/*.*
+       $(RM) $(INSTALL_DIR)/system32/*.*
+       $(RM) $(INSTALL_DIR)/symbols/*.*
+       $(RM) $(INSTALL_DIR)/media/fonts/*.*
+       $(RM) $(INSTALL_DIR)/media/*.*
+       $(RM) $(INSTALL_DIR)/bin/*.*
+       $(RM) $(INSTALL_DIR)/*.com
+       $(RM) $(INSTALL_DIR)/*.bat
+       $(RMDIR) $(INSTALL_DIR)/system32/drivers
+       $(RMDIR) $(INSTALL_DIR)/system32/config
+       $(RMDIR) $(INSTALL_DIR)/system32
+       $(RMDIR) $(INSTALL_DIR)/symbols
+       $(RMDIR) $(INSTALL_DIR)/media/fonts
+       $(RMDIR) $(INSTALL_DIR)/media
+       $(RMDIR) $(INSTALL_DIR)/bin
+       $(RMDIR) $(INSTALL_DIR)
+
+install_dirs:
+       $(RMKDIR) $(INSTALL_DIR)
+       $(RMKDIR) $(INSTALL_DIR)/bin
+       $(RMKDIR) $(INSTALL_DIR)/media
+       $(RMKDIR) $(INSTALL_DIR)/media/fonts
+       $(RMKDIR) $(INSTALL_DIR)/symbols
+       $(RMKDIR) $(INSTALL_DIR)/system32
+       $(RMKDIR) $(INSTALL_DIR)/system32/config
+       $(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) 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
+
+.PHONY: install_clean install_dirs install_before
 
-autoexec_install: $(FLOPPY_DIR)/autoexec.bat
-
-$(FLOPPY_DIR)/autoexec.bat: bootflop.bat
-       $(CP) bootflop.bat $(FLOPPY_DIR)/autoexec.bat
 
 #
 # Make a distribution saveset
 #
 
-clean_dist_dir:
-ifeq ($(DOSCLI),yes)
-       - $(RM) $(DIST_DIR)\dlls\*.dll
-       - $(RM) $(DIST_DIR)\apps\*.exe
-       - $(RM) $(DIST_DIR)\drivers\*.sys
-       - $(RM) $(DIST_DIR)\subsys\*.exe
-       - $(RMDIR) $(DIST_DIR)\dlls
-       - $(RMDIR) $(DIST_DIR)\apps
-       - $(RMDIR) $(DIST_DIR)\drivers
-       - $(RMDIR) $(DIST_DIR)\subsys
-       - $(RMDIR) $(DIST_DIR)
-else
-       $(RM) -r $(DIST_DIR)
-endif
+dist_clean:
+       $(RM) $(DIST_DIR)/symbols/*.sym
+       $(RM) $(DIST_DIR)/drivers/*.sys
+       $(RM) $(DIST_DIR)/subsys/*.exe
+       $(RM) $(DIST_DIR)/dlls/*.dll
+       $(RM) $(DIST_DIR)/apps/*.exe
+       $(RM) $(DIST_DIR)/*.exe
+       $(RMDIR) $(DIST_DIR)/symbols
+       $(RMDIR) $(DIST_DIR)/subsys
+       $(RMDIR) $(DIST_DIR)/drivers
+       $(RMDIR) $(DIST_DIR)/dlls
+       $(RMDIR) $(DIST_DIR)/apps
+       $(RMDIR) $(DIST_DIR)
 
-make_dist_dirs: ./rmkdir
-       ./rmkdir $(DIST_DIR)
-       ./rmkdir $(DIST_DIR)/dlls
-       ./rmkdir $(DIST_DIR)/apps
-       ./rmkdir $(DIST_DIR)/drivers
-       ./rmkdir $(DIST_DIR)/dlls
-       ./rmkdir $(DIST_DIR)/subsys
+dist_dirs:
+       $(RMKDIR) $(DIST_DIR)
+       $(RMKDIR) $(DIST_DIR)/apps
+       $(RMKDIR) $(DIST_DIR)/dlls
+       $(RMKDIR) $(DIST_DIR)/drivers
+       $(RMKDIR) $(DIST_DIR)/subsys
+       $(RMKDIR) $(DIST_DIR)/symbols
+
+.PHONY: dist_clean dist_dirs
 
-.PHONY: clean_dist_dir make_dist_dirs
 
-#
-#
-#
 etags:
        find . -name "*.[ch]" -print | etags --language=c -
 
 # EOF
+