merged in MDL fix and a makefile mod from the 0.1.4 release branch. This represents...
[reactos.git] / reactos / Makefile
index 0610e28..589a4d7 100644 (file)
@@ -1,20 +1,47 @@
+# $Id: Makefile,v 1.175 2003/10/15 22:16:43 vizzini Exp $
 #
 # Global makefile
 #
 
 PATH_TO_TOP = .
 
+#
+# Define to build ReactOS external targets
+#
+ifeq ($(ROS_BUILD_EXT),)
+ROS_BUILD_EXT = no
+else
+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 = acpi isapnp
-DLLS = ntdll kernel32 advapi32 crtdll msvcrt fmifs gdi32 msafd \
-       user32 oleaut32 secur32 shell32 ws2_32 version
-SUBSYS = smss win32k csrss
+
+# Bus drivers
+# acpi isapnp pci
+BUS = acpi isapnp pci
+
+# Filesystem libraries
+# vfatlib
+LIB_FSLIB = vfatlib
+
+# Static libraries
+LIB_STATIC = string rosrtl epsapi zlib
+
+# User mode libraries
+# advapi32 cards crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll
+# epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
+DLLS = advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand msafd \
+       msvcrt ntdll psapi richedit secur32 syssetup twain user32 version winedbgc \
+       winspool ws2help ws2_32 wsock32 wshirda iphlpapi kbdus mswsock msimg32
+
+SUBSYS = smss win32k csrss ntvdm
 
 #
 # Select the server(s) you want to build
@@ -22,142 +49,275 @@ 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
 
-#INPUT_DRIVERS = keyboard
-INPUT_DRIVERS = keyboard mouclass psaux
+# Kernel mode device drivers
+# Obsolete: ide
+# beep blue floppy null parallel ramdrv serenum serial vga videoprt
+DEVICE_DRIVERS = beep blue debugout floppy null serial vga videoprt bootvid
 
-#FS_DRIVERS = vfat minix ext2 template
-FS_DRIVERS = vfat ms np
+# Kernel mode input drivers
+INPUT_DRIVERS = keyboard mouclass psaux sermouse
 
-#NET_DRIVERS = ndis tdi tcpip tditest wshtcpip afd
-NET_DRIVERS = ndis tdi tcpip tditest wshtcpip afd
+# Kernel mode file system drivers
+# cdfs ext2 fs_rec ms np vfat
+FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
 
-#NET_DEVICE_DRIVERS = ne2000
-NET_DEVICE_DRIVERS = ne2000
+# Kernel mode networking drivers
+# afd ndis npf tcpip tdi wshtcpip
+NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
 
-#
-# storage drivers (don't change the order)
-#
-STORAGE_DRIVERS = class2 scsiport atapi disk
+# Kernel mode networking device drivers
+# ne2000 pcnet
+NET_DEVICE_DRIVERS = ne2000 pcnet
 
-#
-# system applications (required for startup)
-#
-#SYS_APPS = lsass services shell winlogon
-SYS_APPS = services shell winlogon
+# Kernel mode storage drivers
+# atapi cdrom class2 disk scsiport
+STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump
 
-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
+# System applications
+# autochk cmd format gstart services setup usetup welcome winlogon
+SYS_APPS = autochk cmd format gstart services setup usetup welcome winlogon
 
-#NET_APPS = ping roshttpd telnet
-NET_APPS = ping roshttpd
+# System services
+# rpcss eventlog
+SYS_SVC = rpcss eventlog
 
+APPS = tests testsets utils
 
-KERNEL_SERVICES = $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
+
+# External (sub)systems for ReactOS
+# rosapps wine posix os2 (requires c++) java (non-existant)
+EXTERNALS = rosapps wine posix os2
+
+ifeq ($(ROS_BUILD_EXT),yes)
+EXT_MODULES = $(EXTERNALS)
+else
+EXT_MODULES =
+endif
+
+KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
        $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
 
-all: tools dk $(COMPONENTS) $(HALS) $(BUS) $(DLLS) $(SUBSYS) \
-     $(LOADERS) $(KERNEL_SERVICES) $(SYS_APPS) $(APPS) $(NET_APPS)
+# Regression tests
+REGTESTS = regtests
+
+all: tools dk implib $(LIB_STATIC) $(COMPONENTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \
+     $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \
+     $(APPS) $(EXT_MODULES) $(REGTESTS)
 
-clean: 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) clean_after tools_clean
+#config: $(TOOLS:%=%_config)
+
+depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) $(DLLS:%=%_depends) $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
+         $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
+
+implib: $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
+        $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
+        $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
+        $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
+        $(APPS:%=%_implib) $(EXT_MODULES:%=%_implib)
+
+clean: tools dk_clean $(HALS:%=%_clean) \
+       $(COMPONENTS:%=%_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
 
 clean_after:
        $(RM) $(PATH_TO_TOP)/include/roscfg.h
 
 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)
+         $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) $(DLLS:%=%_install) $(LOADERS:%=%_install) \
+         $(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \
+         $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
+         $(APPS:%=%_install) $(EXT_MODULES:%=%_install) $(REGTESTS:%=%_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)
+      $(HALS:%=%_dist) $(COMPONENTS:%=%_dist) $(BUS:%=%_dist) $(LIB_STATIC:%=%_dist) $(LIB_FSLIB:%=%_dist) \
+         $(DLLS:%=%_dist) $(LOADERS:%=%_dist) $(KERNEL_DRIVERS:%=%_dist) $(SUBSYS:%=%_dist) \
+      $(SYS_APPS:%=%_dist) $(SYS_SVC:%=%_dist) \
+      $(NET_APPS:%=%_dist) \
+      $(APPS:%=%_dist) $(EXT_MODULES:%=%_dist)
+
+FREELDR_DIR = ../freeldr
+
+freeldr:
+       $(MAKE) -C $(FREELDR_DIR)
+
+bootcd_directory_layout: freeldr
+       $(RMKDIR) $(BOOTCD_DIR)
+       $(RMKDIR) $(BOOTCD_DIR)/bootdisk
+       $(RMKDIR) $(BOOTCD_DIR)/loader
+       $(RMKDIR) $(BOOTCD_DIR)/reactos
+       $(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) $(DLLS:%=%_bootcd) $(KERNEL_DRIVERS:%=%_bootcd) \
+       $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd)
+
+bootcd_install_before:
+       $(RLINE) bootdata/autorun.inf $(BOOTCD_DIR)/autorun.inf
+       $(RLINE) bootdata/readme.txt $(BOOTCD_DIR)/readme.txt
+       $(RLINE) bootdata/hivecls.inf $(BOOTCD_DIR)/reactos/hivecls.inf
+       $(RLINE) bootdata/hivedef.inf $(BOOTCD_DIR)/reactos/hivedef.inf
+       $(RLINE) bootdata/hivesft.inf $(BOOTCD_DIR)/reactos/hivesft.inf
+       $(RLINE) bootdata/hivesys.inf $(BOOTCD_DIR)/reactos/hivesys.inf
+       $(RLINE) bootdata/txtsetup.sif $(BOOTCD_DIR)/reactos/txtsetup.sif
+       $(CP) bootdata/icon.ico $(BOOTCD_DIR)/icon.ico
+       $(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls
+       $(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
+       $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
+
+bootcd_basic: all bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
+
+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
+
+ubootcd_unattend:
+       $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
+
+bootcd: bootcd_basic bootcd_makecd
+
+ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd
+
+registry: tools
+       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(INSTALL_DIR)/system32/config
+
+.PHONY: all depends implib clean clean_before install dist freeldr bootcd_directory_layout \
+bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd
 
-.PHONY: all clean clean_before install dist
 
 #
 # 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
+
+$(SYS_APPS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C subsys/system/$* bootcd
+
+.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist) $(SYS_APPS:%=%_bootcd)
+
+#
+# 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)
 
-.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
 
 #
-# Network applications
+# External ports and subsystem personalities
 #
-$(NET_APPS): %:
-       make -C apps/net/$*
+$(EXTERNALS): %:
+       $(MAKE) -C $(ROOT_PATH)/$*
+
+$(EXTERNALS:%=%_depends): %_depends:
+       $(MAKE) -C $(ROOT_PATH)/$* depends
 
-$(NET_APPS:%=%_clean): %_clean:
-       make -C apps/net/$* clean
+$(EXTERNALS:%=%_implib): %_implib:
+       $(MAKE) -C $(ROOT_PATH)/$* implib
 
-$(NET_APPS:%=%_dist): %_dist:
-       make -C apps/net/$* dist
+$(EXTERNALS:%=%_clean): %_clean:
+       $(MAKE) -C $(ROOT_PATH)/$* clean
 
-$(NET_APPS:%=%_install): %_install:
-       make -C apps/net/$* install
+$(EXTERNALS:%=%_dist): %_dist:
+       $(MAKE) -C $(ROOT_PATH)/$* dist
 
-.PHONY: $(NET_APPS) $(NET_APPS:%=%_clean) $(NET_APPS:%=%_install) $(NET_APPS:%=%_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
+       $(MAKE) -C tools
+
+tools_implib:
 
 tools_clean:
-       make -C tools clean
+       $(MAKE) -C tools clean
 
 tools_install:
 
 tools_dist:
 
-.PHONY: tools tools_clean tools_install tools_dist
+.PHONY: tools tools_implib tools_clean tools_install tools_dist
 
 
 #
@@ -175,6 +335,8 @@ dk:
        $(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:
@@ -195,174 +357,250 @@ dk_install:
 
 dk_dist:
 
-.PHONY: dk dk_clean dk_install dk_dist
+.PHONY: dk dk_implib dk_clean dk_install 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_native_bootcd:
+
 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 \
-        iface_native_dist \
-        iface_additional iface_additional_clean iface_additional_install \
-        iface_additional_dist
+iface_additional_bootcd:
+
+.PHONY: iface_native iface_native_implib iface_native_clean iface_native_install \
+        iface_native_dist iface_native_bootcd \
+        iface_additional iface_additional_implib iface_additional_clean \
+        iface_additional_install iface_additional_dist iface_additional_bootcd
 
 #
 # Bus driver rules
 #
 $(BUS): %:
-       make -C services/bus/$*
+       $(MAKE) -C drivers/bus/$*
+
+$(BUS:%=%_implib): %_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:%=%_clean) \
-        $(BUS:%=%_install) $(BUS:%=%_dist)
+$(BUS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/bus/$* bootcd
+
+.PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
+        $(BUS:%=%_install) $(BUS:%=%_dist) $(BUS:%=%_bootcd)
+
+#
+# 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
+
+$(DRIVERS_LIB:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/lib/$* bootcd
+
+.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \
+        $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_dist) $(DRIVERS_LIB:%=%_bootcd)
 
 #
 # 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) \
-        $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_dist)
+$(DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/dd/$* bootcd
+
+.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \
+        $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_dist) $(DEVICE_DRIVERS:%=%_bootcd)
 
 #
 # 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) \
-        $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_dist)
+$(INPUT_DRIVERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/input/$* bootcd
+
+.PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_clean)\
+        $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_dist) $(INPUT_DRIVERS:%=%_bootcd)
 
 $(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)
+$(FS_DRIVERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/fs/$* bootcd
+
+.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \
+        $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_dist) $(FS_DRIVERS:%=%_bootcd)
 
 #
 # 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)
+$(NET_DRIVERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/net/$* bootcd
+
+.PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_clean) \
+        $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_dist) $(NET_DRIVERS:%=%_bootcd)
 
 $(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) \
-        $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist)
+$(NET_DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/net/dd/$* bootcd
+
+.PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \
+        $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist) $(NET_DEVICE_DRIVERS:%=%_bootcd)
 
 #
 # storage driver rules
 #
 $(STORAGE_DRIVERS): %:
-       make -C services/storage/$*
+       $(MAKE) -C drivers/storage/$*
+
+$(STORAGE_DRIVERS:%=%_implib): %_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)
+$(STORAGE_DRIVERS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/storage/$* bootcd
+
+.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) $(STORAGE_DRIVERS:%=%_implib) \
+               $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_dist) $(STORAGE_DRIVERS:%=%_bootcd)
 
 #
 # 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)
 
 #
@@ -370,91 +608,199 @@ $(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
+
+ntoskrnl_bootcd:
+       $(MAKE) -C ntoskrnl bootcd
 
-.PHONY: ntoskrnl ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
+.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist ntoskrnl_bootcd
 
 #
 # Hardware Abstraction Layer import library
 #
 
 hallib:
-       make -C hal/hal
+       $(MAKE) -C hal/hal
+
+hallib_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
+
+hallib_bootcd:
+       $(MAKE) -C hal/hal bootcd
 
-.PHONY: hallib hallib_clean hallib_install hallib_dist
+.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist hallib_bootcd
 
 #
 # Hardware Abstraction Layers
 #
 
 $(HALS): %:
-       make -C hal/$*
+       $(MAKE) -C hal/$*
+
+$(HALS:%=%_implib): %_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
+
+$(HALS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C hal/$* bootcd
+
+.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist) $(HALS:%=%_bootcd)
+
+#
+# File system libraries
+#
+
+$(LIB_FSLIB): %:
+       $(MAKE) -C lib/fslib/$*
+
+$(LIB_FSLIB:%=%_depends): %_depends:
+       $(MAKE) -C lib/fslib/$* depends
 
-.PHONY: $(HALS) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist)
+$(LIB_FSLIB:%=%_implib): %_implib:
+       $(MAKE) -C lib/fslib/$* implib
+
+$(LIB_FSLIB:%=%_clean): %_clean:
+       $(MAKE) -C lib/fslib/$* clean
+
+$(LIB_FSLIB:%=%_install): %_install:
+       $(MAKE) -C lib/fslib/$* install
+
+$(LIB_FSLIB:%=%_dist): %_dist:
+       $(MAKE) -C lib/fslib/$* dist
+
+$(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:%=%_dist) $(LIB_FSLIB:%=%_bootcd)
+
+#
+# Static libraries
+#
+
+$(LIB_STATIC): %:
+       $(MAKE) -C lib/$*
+
+$(LIB_STATIC:%=%_depends): %_depends:
+       $(MAKE) -C lib/string depends
+
+$(LIB_STATIC:%=%_implib): %_implib:
+       $(MAKE) -C lib/$* implib
+
+$(LIB_STATIC:%=%_clean): %_clean:
+       $(MAKE) -C lib/$* clean
+
+$(LIB_STATIC:%=%_install): %_install:
+       $(MAKE) -C lib/$* install
+
+$(LIB_STATIC:%=%_dist): %_dist:
+       $(MAKE) -C lib/$* dist
+
+$(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:%=%_dist) $(LIB_STATIC:%=%_bootcd)
 
 #
 # 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)
+$(DLLS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C lib/$* bootcd
+
+.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_dist) $(DLLS:%=%_bootcd)
 
 #
-# 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
+
+$(SUBSYS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C subsys/$* bootcd
+
+.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
+        $(SUBSYS:%=%_dist) $(SUBSYS:%=%_bootcd)
+
+#
+# Regression testsuite
+#
+
+$(REGTESTS): %:
+       $(MAKE) -C regtests
+
+$(REGTESTS:%=%_clean): %_clean:
+       $(MAKE) -C regtests clean
+
+$(REGTESTS:%=%_install): %_install:
+       $(MAKE) -C regtests install
+
+.PHONY: $(REGTESTS) $(REGTESTS:%=%_depends) $(SUBSYS:%=%_clean) $(REGTESTS:%=%_install)
 
-.PHONY: $(SUBSYS) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
-        $(SUBSYS:%=%_dist)
 
 #
 # Create an installation
@@ -479,6 +825,25 @@ install_clean:
        $(RMDIR) $(INSTALL_DIR)/bin
        $(RMDIR) $(INSTALL_DIR)
 
+ifneq ($(BOOTCD_INSTALL),)
+
+install_dirs:
+       $(RMKDIR) $(INSTALL_DIR)
+
+install_before:
+       $(RLINE) bootdata/autorun.inf $(INSTALL_DIR)/../autorun.inf
+       $(RLINE) bootdata/readme.txt $(INSTALL_DIR)/../readme.txt
+       $(RLINE) bootdata/hivecls.inf $(INSTALL_DIR)/hivecls.inf
+       $(RLINE) bootdata/hivedef.inf $(INSTALL_DIR)/hivedef.inf
+       $(RLINE) bootdata/hivesft.inf $(INSTALL_DIR)/hivesft.inf
+       $(RLINE) bootdata/hivesys.inf $(INSTALL_DIR)/hivesys.inf
+       $(RLINE) bootdata/txtsetup.sif $(INSTALL_DIR)/txtsetup.sif
+       $(CP) bootdata/icon.ico $(INSTALL_DIR)/../icon.ico
+       $(CP) media/fonts $(INSTALL_DIR)
+       $(CP) media/nls $(INSTALL_DIR)
+
+else # !BOOTCD_INSTALL
+
 install_dirs:
        $(RMKDIR) $(INSTALL_DIR)
        $(RMKDIR) $(INSTALL_DIR)/bin
@@ -490,11 +855,16 @@ 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) media/fonts/helb____.ttf $(INSTALL_DIR)/media/fonts/helb____.ttf
-       $(CP) media/fonts/timr____.ttf $(INSTALL_DIR)/media/fonts/timr____.ttf
+       $(CP) media/fonts $(INSTALL_DIR)/media/fonts
+       $(CP) media/nls $(INSTALL_DIR)/system32
+       $(CP) media/nls/c_1252.nls $(INSTALL_DIR)/system32/ansi.nls
+       $(CP) media/nls/c_437.nls $(INSTALL_DIR)/system32/oem.nls
+       $(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls
+
+endif # BOOTCD_INSTALL
 
 .PHONY: install_clean install_dirs install_before
 
@@ -527,8 +897,8 @@ dist_dirs:
 
 .PHONY: dist_clean dist_dirs
 
-
 etags:
        find . -name "*.[ch]" -print | etags --language=c -
 
 # EOF
+