added lib Doxygen config file
[reactos.git] / reactos / Makefile
index 40685d1..869aa51 100644 (file)
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.190 2003/12/07 13:08:01 mf Exp $
 #
 # Global makefile
 #
@@ -5,25 +6,47 @@
 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
+
+# Filesystem libraries
+# vfatlib
+LIB_FSLIB = vfatlib
+
+# Static libraries
+LIB_STATIC = string rosrtl epsapi zlib
+
+# Keyboard layout libraries
+DLLS_KBD = kbdus kbdgr kbdfr
+
+# User mode libraries
+# advapi32 cards crtdll fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll
+# epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
+# imagehlp
+DLLS = libwine advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand \
+       msafd msvcrt ntdll psapi richedit rpcrt4 secur32 syssetup twain user32 version \
+       winspool ws2help ws2_32 wsock32 wshirda iphlpapi msgina mswsock msimg32 d3d8thk \
+       winmm ole32 comctl32 $(DLLS_KBD)
+
+SUBSYS = smss win32k csrss ntvdm
 
 #
 # Select the server(s) you want to build
@@ -31,199 +54,255 @@ 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 cdrom
+# 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
+
+# System applications
+# autochk cmd format services setup usetup welcome winlogon
+SYS_APPS = autochk cmd format services setup usetup welcome winlogon userinit
 
-#readfile
-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 stats pice
+# System services
+# rpcss eventlog
+SYS_SVC = rpcss eventlog
 
-  
-#lzexpand (missing imports)
-#dsound (missing winmm.dll)
-WINE_DLLS = rpcrt4 mapi32 ole32 oleaut32 oledlg olepro32 olecli olesvr \
-            shell32 shlwapi comctl32 shfolder shdocvw commdlg \
-            ddraw dinput dplay dplayx \
-            psapi richedit serialui urlmon winspool
+APPS = tests testsets utils
 
-WINE_PROGS = clock cmdlgtst control notepad osversioncheck \
-             progman uninstaller view wcmd winefile winemine \
-             winver
 
-ifeq ($(ROS_BUILD_WINE),yes)
-WINE_MODULES = $(WINE_DLLS) $(WINE_PROGS)
+# 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
-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) \
-     $(WINE_MODULES)
+# Regression tests
+REGTESTS = regtests
 
-implib: $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
-        $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
-        $(KERNEL_SERVICES:%=%_implib) $(SUBSYS:%=%_implib) \
-        $(SYS_APPS:%=%_implib) $(APPS:%=%_implib) \
-        $(WINE_MODULES:%=%_implib)
+all: tools dk implib $(LIB_STATIC) $(COMPONENTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \
+     $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \
+     $(APPS) $(EXT_MODULES) $(REGTESTS)
+
+#config: $(TOOLS:%=%_config)
 
-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) \
-       $(WINE_MODULES:%=%_clean) clean_after tools_clean
+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) \
-         $(WINE_MODULES:%=%_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) \
+         registry
+
+FREELDR_DIR = ../freeldr
+
+freeldr:
+       $(MAKE) -C $(FREELDR_DIR)
+
+bootcd_directory_layout:
+       $(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: 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 freeldr bootcd_directory_layout \
+bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd
 
-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)
-
-.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
-
-$(SYS_APPS:%=%_dist): %_dist:
-       make -C apps/system/$* dist
+       $(MAKE) -C subsys/system/$* clean
 
 $(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)
+$(SYS_APPS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C subsys/system/$* bootcd
+
+.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd)
 
 #
-# Applications
+# System Services
 #
-$(APPS): %:
-       make -C apps/$*
+$(SYS_SVC): %:
+       $(MAKE) -C services/$*
 
-$(APPS:%=%_implib): %_implib:
-       make -C apps/$* implib
+$(SYS_SVC:%=%_depends): %_depends:
+       $(MAKE) -C services/$* depends
 
-$(APPS:%=%_clean): %_clean:
-       make -C apps/$* clean
+$(SYS_SVC:%=%_implib): %_implib:
+       $(MAKE) -C services/$* implib
 
-$(APPS:%=%_dist): %_dist:
-       make -C apps/$* dist
+$(SYS_SVC:%=%_clean): %_clean:
+       $(MAKE) -C services/$* clean
 
-$(APPS:%=%_install): %_install:
-       make -C apps/$* install
+$(SYS_SVC:%=%_install): %_install:
+       $(MAKE) -C services/$* install
+
+.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install)
 
-.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
 
 #
-# Wine DLLs
+# Applications
 #
-$(WINE_DLLS): %:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$*
-
-$(WINE_DLLS:%=%_implib): %_implib:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* implib
+#
+# Extra (optional system) Applications
+#
+$(APPS): %:
+       $(MAKE) -C apps/$*
 
-$(WINE_DLLS:%=%_clean): %_clean:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* clean
+$(APPS:%=%_implib): %_implib:
+       $(MAKE) -C apps/$* implib
 
-$(WINE_DLLS:%=%_dist): %_dist:
-       make -f makefile.ros -C $(WINE_PATH)/dlls/$* dist
+$(APPS:%=%_clean): %_clean:
+       $(MAKE) -C apps/$* clean
 
-$(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)
 
 
 #
-# Wine programs
+# External ports and subsystem personalities
 #
-$(WINE_PROGS): %:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$*
+$(EXTERNALS): %:
+       $(MAKE) -C $(ROOT_PATH)/$*
 
-$(WINE_PROGS:%=%_implib): %_implib:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* implib
+$(EXTERNALS:%=%_depends): %_depends:
+       $(MAKE) -C $(ROOT_PATH)/$* depends
 
-$(WINE_PROGS:%=%_clean): %_clean:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* clean
+$(EXTERNALS:%=%_implib): %_implib:
+       $(MAKE) -C $(ROOT_PATH)/$* implib
 
-$(WINE_PROGS:%=%_dist): %_dist:
-       make -f makefile.ros -C $(WINE_PATH)/programs/$* dist
+$(EXTERNALS:%=%_clean): %_clean:
+       $(MAKE) -C $(ROOT_PATH)/$* clean
 
-$(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)
 
 
 #
 # 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_implib tools_clean tools_install tools_dist
+.PHONY: tools tools_implib tools_clean tools_install
 
 
 #
@@ -261,310 +340,412 @@ dk_clean:
 
 dk_install:
 
-dk_dist:
-
-.PHONY: dk dk_implib dk_clean dk_install dk_dist
+.PHONY: dk dk_implib dk_clean dk_install
 
 
 #
 # 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:
+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_install iface_additional_bootcd
+
 
 #
 # 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
+$(BUS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/bus/$* bootcd
 
 .PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
-        $(BUS:%=%_install) $(BUS:%=%_dist)
+        $(BUS:%=%_install) $(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:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/lib/$* bootcd
+
+.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \
+        $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd)
+
 
 #
 # 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
+$(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:%=%_bootcd)
+
 
 #
 # 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
+$(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:%=%_bootcd)
 
+
+#
+# Filesystem driver rules
+#
 $(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
+$(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:%=%_bootcd)
+
 
 #
 # 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
+$(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:%=%_bootcd)
+
 
+#
+# Network device driver rules
+#
 $(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
+$(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:%=%_bootcd)
+
 
 #
 # 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:%=%_bootcd): %_bootcd:
+       $(MAKE) -C drivers/storage/$* bootcd
 
-$(STORAGE_DRIVERS:%=%_dist): %_dist:
-       make -C services/storage/$* dist
+.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) $(STORAGE_DRIVERS:%=%_implib) \
+               $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd)
 
-.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
+.PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install)
 
-.PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install) \
-        $(LOADERS:%=%_dist)
 
 #
 # Required system components
 #
-
 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
+ntoskrnl_bootcd:
+       $(MAKE) -C ntoskrnl bootcd
+
+.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_bootcd
 
-.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
 
 #
 # Hardware Abstraction Layer import library
 #
-
 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
+hallib_bootcd:
+       $(MAKE) -C hal/hal bootcd
+
+.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_bootcd
 
-.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist
 
 #
 # Hardware Abstraction Layers
 #
-
 $(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
+$(HALS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C hal/$* bootcd
+
+.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_bootcd)
 
-.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist)
 
 #
-# Required DLLs
+# 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:%=%_bootcd): %_bootcd:
+       $(MAKE) -C lib/fslib/$* bootcd
+
+.PHONY: $(LIB_FSLIB) $(LIB_FSLIB:%=%_depends) $(LIB_FSLIB:%=%_implib) $(LIB_FSLIB:%=%_clean) \
+       $(LIB_FSLIB:%=%_install) $(LIB_FSLIB:%=%_bootcd)
+
+
+#
+# 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:%=%_bootcd): %_bootcd:
+       $(MAKE) -C lib/$* bootcd
+
+.PHONY: $(LIB_STATIC) $(LIB_STATIC:%=%_depends) $(LIB_STATIC:%=%_implib) $(LIB_STATIC:%=%_clean) \
+       $(LIB_STATIC:%=%_install) $(LIB_STATIC:%=%_bootcd)
 
+
+#
+# DLLs
+#
 $(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
+$(DLLS:%=%_bootcd): %_bootcd:
+       $(MAKE) -C lib/$* bootcd
+
+.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) \
+        $(DLLS:%=%_bootcd)
 
-.PHONY: $(DLLS) $(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:%=%_bootcd): %_bootcd:
+       $(MAKE) -C subsys/$* bootcd
+
+.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
+        $(SUBSYS:%=%_bootcd)
+
+#
+# Regression testsuite
+#
+
+$(REGTESTS): %:
+       $(MAKE) -C regtests
+
+$(REGTESTS:%=%_clean): %_clean:
+       $(MAKE) -C regtests clean
 
-$(SUBSYS:%=%_dist): %_dist:
-       make -C subsys/$* dist
+$(REGTESTS:%=%_install): %_install:
+       $(MAKE) -C regtests install
+
+.PHONY: $(REGTESTS) $(REGTESTS:%=%_depends) $(SUBSYS:%=%_clean) $(REGTESTS:%=%_install)
 
-.PHONY: $(SUBSYS) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
-        $(SUBSYS:%=%_dist)
 
 #
 # Create an installation
@@ -600,45 +781,51 @@ 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
 
 .PHONY: install_clean install_dirs install_before
 
 
-#
-# Make a distribution saveset
-#
+etags:
+       find . -name "*.[ch]" -print | etags --language=c -
 
-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)
 
-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
+docu:
+       echo generating ReactOS NTOSKRNL documentation ...
+       $(MAKE) -C ntoskrnl docu
 
-.PHONY: dist_clean dist_dirs
+       echo generating ReactOS drivers documentation ...
+       $(MAKE) -C drivers docu
 
+       echo generating ReactOS NTDLL documentation ...
+       $(MAKE) -C lib/ntdll docu
+
+       echo generating ReactOS Freetype documentation ...
+       $(MAKE) -C lib/freetype docu
+
+       echo generating ReactOS libs documentation ...
+       $(MAKE) -C lib docu
+
+       echo generating ReactOS WIN32K documentation ...
+       $(MAKE) -C subsys/win32k docu
+
+       echo generating ReactOS apps+tools documentation ...
+       $(MAKE) -C apps docu
+
+       echo generating ReactOS explorer documentation ...
+       $(MAKE) -C subsys/system/explorer
+
+       echo generating remaining ReactOS documentation ...
+       doxygen Doxyfile
+
+.PHONY: docu
 
-etags:
-       find . -name "*.[ch]" -print | etags --language=c -
 
 # EOF