merged in MDL fix and a makefile mod from the 0.1.4 release branch. This represents...
[reactos.git] / reactos / Makefile
index ccb1cfe..589a4d7 100644 (file)
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.175 2003/10/15 22:16:43 vizzini Exp $
 #
 # Global makefile
 #
@@ -26,11 +27,19 @@ HALS = halx86
 # 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 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 freetype gdi32 kernel32 packet msafd msvcrt ntdll \
-       secur32 user32 version winedbgc ws2help ws2_32 wshirda zlib #winmm 
+# 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
 
@@ -51,11 +60,10 @@ DRIVERS_LIB = bzip2
 # 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
+DEVICE_DRIVERS = beep blue debugout floppy null serial vga videoprt bootvid
 
 # Kernel mode input drivers
-# keyboard mouclass psaux sermouse
-INPUT_DRIVERS = keyboard mouclass psaux
+INPUT_DRIVERS = keyboard mouclass psaux sermouse
 
 # Kernel mode file system drivers
 # cdfs ext2 fs_rec ms np vfat
@@ -66,16 +74,16 @@ FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
 NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
 
 # Kernel mode networking device drivers
-# ne2000
-NET_DEVICE_DRIVERS = ne2000
+# ne2000 pcnet
+NET_DEVICE_DRIVERS = ne2000 pcnet
 
 # Kernel mode storage drivers
 # atapi cdrom class2 disk scsiport
-STORAGE_DRIVERS = atapi cdrom class2 disk scsiport
+STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump
 
 # System applications
-# autochk lsass services shell winlogon
-SYS_APPS = autochk services cmd winlogon gstart usetup
+# autochk cmd format gstart services setup usetup welcome winlogon
+SYS_APPS = autochk cmd format gstart services setup usetup welcome winlogon
 
 # System services
 # rpcss eventlog
@@ -97,27 +105,30 @@ endif
 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) \
+# 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)
+     $(APPS) $(EXT_MODULES) $(REGTESTS)
 
 #config: $(TOOLS:%=%_config)
 
-depends: $(DLLS:%=%_depends) $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
+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) \
-        $(DLLS:%=%_implib) $(LOADERS:%=%_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) $(DLLS:%=%_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) \
+       $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) $(REGTESTS:%=%_clean) \
        clean_after tools_clean
 
 clean_after:
@@ -125,19 +136,75 @@ clean_after:
 
 install: tools install_dirs install_before \
          $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
-         $(DLLS:%=%_install) $(LOADERS:%=%_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)
+         $(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_DRIVERS:%=%_dist) $(SUBSYS:%=%_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)
 
-.PHONY: all depends implib clean clean_before install 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
 
 
 #
@@ -158,7 +225,10 @@ $(SYS_APPS:%=%_dist): %_dist:
 $(SYS_APPS:%=%_install): %_install:
        $(MAKE) -C subsys/system/$* install
 
-.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist)
+$(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
@@ -305,6 +375,8 @@ iface_native_install:
 
 iface_native_dist:
 
+iface_native_bootcd:
+
 iface_additional:
        $(MAKE) -C iface/addsys
 
@@ -317,10 +389,12 @@ 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_dist iface_native_bootcd \
         iface_additional iface_additional_implib iface_additional_clean \
-        iface_additional_install iface_additional_dist
+        iface_additional_install iface_additional_dist iface_additional_bootcd
 
 #
 # Bus driver rules
@@ -340,8 +414,11 @@ $(BUS:%=%_install): %_install:
 $(BUS:%=%_dist): %_dist:
        $(MAKE) -C drivers/bus/$* dist
 
+$(BUS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/bus/$* bootcd
+
 .PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
-        $(BUS:%=%_install) $(BUS:%=%_dist)
+        $(BUS:%=%_install) $(BUS:%=%_dist) $(BUS:%=%_bootcd)
 
 #
 # Driver support libraries rules
@@ -361,8 +438,11 @@ $(DRIVERS_LIB:%=%_install): %_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:%=%_install) $(DRIVERS_LIB:%=%_dist) $(DRIVERS_LIB:%=%_bootcd)
 
 #
 # Device driver rules
@@ -382,8 +462,11 @@ $(DEVICE_DRIVERS:%=%_install): %_install:
 $(DEVICE_DRIVERS:%=%_dist): %_dist:
        $(MAKE) -C drivers/dd/$* 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:%=%_install) $(DEVICE_DRIVERS:%=%_dist) $(DEVICE_DRIVERS:%=%_bootcd)
 
 #
 # Input driver rules
@@ -403,8 +486,11 @@ $(INPUT_DRIVERS:%=%_install): %_install:
 $(INPUT_DRIVERS:%=%_dist): %_dist:
        $(MAKE) -C drivers/input/$* 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:%=%_install) $(INPUT_DRIVERS:%=%_dist) $(INPUT_DRIVERS:%=%_bootcd)
 
 $(FS_DRIVERS): %:
        $(MAKE) -C drivers/fs/$*
@@ -421,8 +507,11 @@ $(FS_DRIVERS:%=%_install): %_install:
 $(FS_DRIVERS:%=%_dist): %_dist:
        $(MAKE) -C drivers/fs/$* 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:%=%_install) $(FS_DRIVERS:%=%_dist) $(FS_DRIVERS:%=%_bootcd)
 
 #
 # Network driver rules
@@ -442,8 +531,11 @@ $(NET_DRIVERS:%=%_install): %_install:
 $(NET_DRIVERS:%=%_dist): %_dist:
        $(MAKE) -C drivers/net/$* 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:%=%_install) $(NET_DRIVERS:%=%_dist) $(NET_DRIVERS:%=%_bootcd)
 
 $(NET_DEVICE_DRIVERS): %:
        $(MAKE) -C drivers/net/dd/$*
@@ -460,8 +552,11 @@ $(NET_DEVICE_DRIVERS:%=%_install): %_install:
 $(NET_DEVICE_DRIVERS:%=%_dist): %_dist:
        $(MAKE) -C drivers/net/dd/$* 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:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist) $(NET_DEVICE_DRIVERS:%=%_bootcd)
 
 #
 # storage driver rules
@@ -481,8 +576,11 @@ $(STORAGE_DRIVERS:%=%_install): %_install:
 $(STORAGE_DRIVERS:%=%_dist): %_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
@@ -524,7 +622,10 @@ ntoskrnl_install:
 ntoskrnl_dist:
        $(MAKE) -C ntoskrnl dist
 
-.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
+ntoskrnl_bootcd:
+       $(MAKE) -C ntoskrnl bootcd
+
+.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist ntoskrnl_bootcd
 
 #
 # Hardware Abstraction Layer import library
@@ -545,7 +646,10 @@ hallib_install:
 hallib_dist:
        $(MAKE) -C hal/hal dist
 
-.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist
+hallib_bootcd:
+       $(MAKE) -C hal/hal bootcd
+
+.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist hallib_bootcd
 
 #
 # Hardware Abstraction Layers
@@ -566,7 +670,66 @@ $(HALS:%=%_install): %_install:
 $(HALS:%=%_dist): %_dist:
        $(MAKE) -C hal/$* dist
 
-.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_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
+
+$(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
@@ -590,7 +753,10 @@ $(DLLS:%=%_install): %_install:
 $(DLLS:%=%_dist): %_dist:
        $(MAKE) -C lib/$* dist
 
-.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(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)
 
 #
 # Subsystem support modules
@@ -614,8 +780,27 @@ $(SUBSYS:%=%_install): %_install:
 $(SUBSYS:%=%_dist): %_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:%=%_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)
+
 
 #
 # Create an installation
@@ -640,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
@@ -654,9 +858,13 @@ 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
+       $(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
 
@@ -689,7 +897,6 @@ dist_dirs:
 
 .PHONY: dist_clean dist_dirs
 
-
 etags:
        find . -name "*.[ch]" -print | etags --language=c -