NtOpenThreadToken() opens the thread token if OpenAsSelf is FALSE.
[reactos.git] / reactos / Makefile
index 398016a..3747754 100644 (file)
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.235 2004/07/10 21:44:14 sedwards Exp $
 #
 # Global makefile
 #
@@ -31,14 +32,23 @@ BUS = acpi isapnp pci
 LIB_FSLIB = vfatlib
 
 # Static libraries
-LIB_STATIC = string rosrtl epsapi zlib
+LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh
+
+# Keyboard layout libraries
+DLLS_KBD = kbddv kbdfr kbdgr kbdse kbduk kbdus
+
+# Control Panels
+DLLS_CPL = cpl
 
 # User mode libraries
-# advapi32 cards crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll
-# epsapi psapi rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda
-DLLS = advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand msafd \
-       msvcrt ntdll psapi secur32 syssetup twain user32 version winedbgc \
-       winspool ws2help ws2_32 wsock32 wshirda iphlpapi kbdus
+# advapi32 cards crtdll comdlg32 fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll
+# epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
+# imagehlp imm32
+DLLS = acledit advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
+       imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 msvideo mswsock \
+       netapi32 ntdll ole32 oleaut32 oledlg packet psapi richedit rpcrt4 samlib secur32 \
+       setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 userenv version wininet \
+       winmm winspool ws2help ws2_32 wsock32 wshirda imagehlp $(DLLS_KBD) $(DLLS_CPL)
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -53,13 +63,13 @@ SERVERS = win32
 LOADERS = dos
 
 # Driver support libraries
-#bzip2 zlib
-DRIVERS_LIB = bzip2
+#bzip2 zlib oskittcp
+DRIVERS_LIB = bzip2 oskittcp csq
 
 # 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
+# beep blue floppy null parallel ramdrv serenum serial
+DEVICE_DRIVERS = beep blue debugout null serial bootvid
 
 # Kernel mode input drivers
 INPUT_DRIVERS = keyboard mouclass psaux sermouse
@@ -78,11 +88,11 @@ NET_DEVICE_DRIVERS = ne2000 pcnet
 
 # Kernel mode storage drivers
 # atapi cdrom class2 disk scsiport
-STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump
+STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
 
 # System applications
-# autochk cmd format gstart services setup usetup welcome winlogon
-SYS_APPS = autochk cmd format gstart services setup usetup welcome winlogon
+# autochk cmd format services setup usetup welcome winlogon
+SYS_APPS = autochk cmd explorer expand format services setup taskmgr userinit usetup welcome vmwinst winlogon regedit
 
 # System services
 # rpcss eventlog
@@ -91,9 +101,9 @@ SYS_SVC = rpcss eventlog
 APPS = tests testsets utils
 
 
-# External (sub)systems for ReactOS
-# rosapps wine posix os2 (requires c++) java (non-existant)
-EXTERNALS = rosapps wine posix os2
+# External modules and (sub)systems for ReactOS
+# rosapps posix os2 (requires c++) java (non-existant)
+EXTERNALS = rosapps
 
 ifeq ($(ROS_BUILD_EXT),yes)
 EXT_MODULES = $(EXTERNALS)
@@ -102,14 +112,14 @@ EXT_MODULES =
 endif
 
 KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
-       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
+       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS
 
 # Regression tests
 REGTESTS = regtests
 
-all: tools dk implib $(LIB_STATIC) $(COMPONENTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \
+all: tools dk implib $(LIB_STATIC) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \
      $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \
-     $(APPS) $(EXT_MODULES) $(REGTESTS)
+     $(APPS) $(EXT_MODULES)
 
 #config: $(TOOLS:%=%_config)
 
@@ -117,10 +127,9 @@ depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) $(DLLS:%=%_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)
+       $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) $(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
+       $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
+       $(SYS_SVC:%=%_implib) $(EXT_MODULES:%=%_implib)
 
 clean: tools dk_clean $(HALS:%=%_clean) \
        $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) $(DLLS:%=%_clean) \
@@ -133,26 +142,20 @@ clean: tools dk_clean $(HALS:%=%_clean) \
 clean_after:
        $(RM) $(PATH_TO_TOP)/include/roscfg.h
 
-install: tools install_dirs install_before \
+fastinstall: tools install_dirs install_before \
          $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_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) $(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)
+install: fastinstall registry
 
 FREELDR_DIR = ../freeldr
 
 freeldr:
        $(MAKE) -C $(FREELDR_DIR)
 
-bootcd_directory_layout: freeldr
+bootcd_directory_layout:
        $(RMKDIR) $(BOOTCD_DIR)
        $(RMKDIR) $(BOOTCD_DIR)/bootdisk
        $(RMKDIR) $(BOOTCD_DIR)/loader
@@ -165,7 +168,6 @@ bootcd_directory_layout: freeldr
        $(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.INI ${BOOTCD_DIR}/loader/freeldr.ini
        $(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys
 
 bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \
@@ -181,18 +183,56 @@ bootcd_install_before:
        $(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) subsys/system/welcome/welcome.exe $(BOOTCD_DIR)/reactos/welcome.exe
        $(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
+       $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
 
-bootcd: all bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
+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
 
-.PHONY: all depends implib clean clean_before install dist freeldr bootcd_directory_layout \
-bootcd_bootstrap_files bootcd
+ubootcd_unattend:
+       $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
+
+livecd_directory_layout:
+       $(RMKDIR) $(LIVECD_DIR)
+       $(RMKDIR) $(LIVECD_DIR)/loader
+       $(RMKDIR) $(LIVECD_DIR)/reactos
+       $(RMKDIR) $(LIVECD_DIR)/Profiles/All\ Users/Desktop
+       $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/Desktop
+       $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
+       $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${LIVECD_DIR}/../isoboot.bin
+       $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
+       $(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini
+
+livecd_bootstrap_files:
+       $(MAKE) LIVECD_INSTALL=yes fastinstall
+
+livecd_install_before:
+       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(LIVECD_DIR)/reactos/system32/config bootdata/livecd.inf bootdata/hiveinst.inf
+
+livecd_basic: livecd_directory_layout livecd_bootstrap_files livecd_install_before
+
+livecd_makecd:
+       $(TOOLS_PATH)/cdmake/cdmake -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso
+
+bootcd: bootcd_basic bootcd_makecd
+
+ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd
+
+livecd: livecd_basic livecd_makecd
+
+registry: tools
+       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf
+
+.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
 
 
 #
@@ -207,16 +247,13 @@ $(SYS_APPS:%=%_implib): %_implib:
 $(SYS_APPS:%=%_clean): %_clean:
        $(MAKE) -C subsys/system/$* clean
 
-$(SYS_APPS:%=%_dist): %_dist:
-       $(MAKE) -C subsys/system/$* dist
-
 $(SYS_APPS:%=%_install): %_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)
+.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd)
 
 #
 # System Services
@@ -233,13 +270,10 @@ $(SYS_SVC:%=%_implib): %_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_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install)
 
 
 #
@@ -251,19 +285,17 @@ $(SYS_SVC:%=%_install): %_install:
 $(APPS): %:
        $(MAKE) -C apps/$*
 
-$(APPS:%=%_implib): %_implib:
-       $(MAKE) -C apps/$* implib
+# Not needed
+# $(APPS:%=%_implib): %_implib:
+#      $(MAKE) -C apps/$* implib
 
 $(APPS:%=%_clean): %_clean:
        $(MAKE) -C apps/$* clean
 
-$(APPS:%=%_dist): %_dist:
-       $(MAKE) -C apps/$* dist
-
 $(APPS:%=%_install): %_install:
        $(MAKE) -C apps/$* install
 
-.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
+.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install)
 
 
 #
@@ -281,13 +313,10 @@ $(EXTERNALS:%=%_implib): %_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)
+.PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install)
 
 
 #
@@ -303,9 +332,7 @@ tools_clean:
 
 tools_install:
 
-tools_dist:
-
-.PHONY: tools tools_implib tools_clean tools_install tools_dist
+.PHONY: tools tools_implib tools_clean tools_install
 
 
 #
@@ -343,9 +370,7 @@ dk_clean:
 
 dk_install:
 
-dk_dist:
-
-.PHONY: dk dk_implib dk_clean dk_install dk_dist
+.PHONY: dk dk_implib dk_clean dk_install
 
 
 #
@@ -361,8 +386,6 @@ iface_native_clean:
 
 iface_native_install:
 
-iface_native_dist:
-
 iface_native_bootcd:
 
 iface_additional:
@@ -375,14 +398,13 @@ 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_native_bootcd \
         iface_additional iface_additional_implib iface_additional_clean \
-        iface_additional_install iface_additional_dist iface_additional_bootcd
+        iface_additional_install iface_additional_bootcd
+
 
 #
 # Bus driver rules
@@ -399,14 +421,12 @@ $(BUS:%=%_clean): %_clean:
 $(BUS:%=%_install): %_install:
        $(MAKE) -C drivers/bus/$* 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:%=%_bootcd)
+        $(BUS:%=%_install) $(BUS:%=%_bootcd)
+
 
 #
 # Driver support libraries rules
@@ -423,14 +443,12 @@ $(DRIVERS_LIB:%=%_clean): %_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)
+        $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd)
+
 
 #
 # Device driver rules
@@ -447,14 +465,34 @@ $(DEVICE_DRIVERS:%=%_clean): %_clean:
 $(DEVICE_DRIVERS:%=%_install): %_install:
        $(MAKE) -C drivers/dd/$* 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:%=%_bootcd)
+        $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_bootcd)
+
+
+#
+# Video device driver rules
+#
+VIDEO_DRIVERS: 
+       $(MAKE) -C drivers/video
+
+VIDEO_DRIVERS_implib:
+       $(MAKE) -C drivers/video implib
+
+VIDEO_DRIVERS_clean:
+       $(MAKE) -C drivers/video clean
+
+VIDEO_DRIVERS_install:
+       $(MAKE) -C drivers/video install
+
+VIDEO_DRIVERS_bootcd:
+       $(MAKE) -C drivers/video bootcd
+
+.PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_clean \
+        VIDEO_DRIVERS_install VIDEO_DRIVERS_bootcd
+
 
 #
 # Input driver rules
@@ -471,15 +509,15 @@ $(INPUT_DRIVERS:%=%_clean): %_clean:
 $(INPUT_DRIVERS:%=%_install): %_install:
        $(MAKE) -C drivers/input/$* 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:%=%_bootcd)
+        $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_bootcd)
 
+#
+# Filesystem driver rules
+#
 $(FS_DRIVERS): %:
        $(MAKE) -C drivers/fs/$*
 
@@ -492,14 +530,12 @@ $(FS_DRIVERS:%=%_clean): %_clean:
 $(FS_DRIVERS:%=%_install): %_install:
        $(MAKE) -C drivers/fs/$* 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:%=%_bootcd)
+        $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_bootcd)
+
 
 #
 # Network driver rules
@@ -516,15 +552,16 @@ $(NET_DRIVERS:%=%_clean): %_clean:
 $(NET_DRIVERS:%=%_install): %_install:
        $(MAKE) -C drivers/net/$* 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:%=%_bootcd)
+        $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_bootcd)
+
 
+#
+# Network device driver rules
+#
 $(NET_DEVICE_DRIVERS): %:
        $(MAKE) -C drivers/net/dd/$*
 
@@ -537,14 +574,12 @@ $(NET_DEVICE_DRIVERS:%=%_clean): %_clean:
 $(NET_DEVICE_DRIVERS:%=%_install): %_install:
        $(MAKE) -C drivers/net/dd/$* 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:%=%_bootcd)
+        $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_bootcd)
+
 
 #
 # storage driver rules
@@ -561,19 +596,16 @@ $(STORAGE_DRIVERS:%=%_clean): %_clean:
 $(STORAGE_DRIVERS:%=%_install): %_install:
        $(MAKE) -C drivers/storage/$* install
 
-$(STORAGE_DRIVERS:%=%_dist): %_dist:
-       $(MAKE) -C drivers/storage/$* 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)
+               $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd)
+
 
 #
 # Kernel loaders
 #
-
 $(LOADERS): %:
        $(MAKE) -C loaders/$*
 
@@ -585,16 +617,12 @@ $(LOADERS:%=%_clean): %_clean:
 $(LOADERS:%=%_install): %_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
 
@@ -607,18 +635,15 @@ ntoskrnl_clean:
 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_dist ntoskrnl_bootcd
+.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_bootcd
+
 
 #
 # Hardware Abstraction Layer import library
 #
-
 hallib:
        $(MAKE) -C hal/hal
 
@@ -631,18 +656,15 @@ hallib_clean:
 hallib_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_dist hallib_bootcd
+.PHONY: hallib hallib_implib hallib_clean hallib_install hallib_bootcd
+
 
 #
 # Hardware Abstraction Layers
 #
-
 $(HALS): %:
        $(MAKE) -C hal/$*
 
@@ -655,18 +677,15 @@ $(HALS:%=%_clean): %_clean:
 $(HALS:%=%_install): %_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:%=%_dist) $(HALS:%=%_bootcd)
+.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_bootcd)
+
 
 #
 # File system libraries
 #
-
 $(LIB_FSLIB): %:
        $(MAKE) -C lib/fslib/$*
 
@@ -682,19 +701,16 @@ $(LIB_FSLIB:%=%_clean): %_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)
+       $(LIB_FSLIB:%=%_install) $(LIB_FSLIB:%=%_bootcd)
+
 
 #
 # Static libraries
 #
-
 $(LIB_STATIC): %:
        $(MAKE) -C lib/$*
 
@@ -710,19 +726,16 @@ $(LIB_STATIC:%=%_clean): %_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)
+       $(LIB_STATIC:%=%_install) $(LIB_STATIC:%=%_bootcd)
+
 
 #
-# Required DLLs
+# DLLs
 #
-
 $(DLLS): %:
        $(MAKE) -C lib/$*
 
@@ -738,18 +751,16 @@ $(DLLS:%=%_clean): %_clean:
 $(DLLS:%=%_install): %_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:%=%_dist) $(DLLS:%=%_bootcd)
+.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) \
+        $(DLLS:%=%_bootcd)
+
 
 #
 # Subsystem support modules
 #
-
 $(SUBSYS): %:
        $(MAKE) -C subsys/$*
 
@@ -765,14 +776,11 @@ $(SUBSYS:%=%_clean): %_clean:
 $(SUBSYS:%=%_install): %_install:
        $(MAKE) -C subsys/$* 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:%=%_bootcd)
+        $(SUBSYS:%=%_bootcd)
 
 #
 # Regression testsuite
@@ -813,25 +821,6 @@ 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
@@ -841,6 +830,7 @@ install_dirs:
        $(RMKDIR) $(INSTALL_DIR)/system32
        $(RMKDIR) $(INSTALL_DIR)/system32/config
        $(RMKDIR) $(INSTALL_DIR)/system32/drivers
+       $(RMKDIR) $(INSTALL_DIR)/system32/drivers/etc
 
 install_before:
        $(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
@@ -851,42 +841,46 @@ install_before:
        $(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
+       $(CP) media/drivers/etc/services \
+               $(INSTALL_DIR)/system32/drivers/etc/services
 
 .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 full-docu
+
+       echo generating remaining ReactOS documentation ...
+       doxygen Doxyfile
+
+.PHONY: docu
 
-etags:
-       find . -name "*.[ch]" -print | etags --language=c -
 
 # EOF