[ros-diffs] [chorns] 15583: Merge 12735:15568 from xmlbuildsystem branch

Merge 12735:15568 from xmlbuildsystem branch
Modified: trunk/reactos/INSTALL
Deleted: trunk/reactos/Jamfile
Deleted: trunk/reactos/Jamrules
Modified: trunk/reactos/Makefile
Added: trunk/reactos/ReactOS.xml
Added: trunk/reactos/apps/directory.xml
Added: trunk/reactos/apps/utils/directory.xml
Modified: trunk/reactos/apps/utils/net/arp/arp.c
Added: trunk/reactos/apps/utils/net/arp/arp.xml
Deleted: trunk/reactos/apps/utils/net/arp/makefile
Added: trunk/reactos/apps/utils/net/directory.xml
Modified: trunk/reactos/apps/utils/net/finger/finger.c
Added: trunk/reactos/apps/utils/net/finger/finger.xml
Deleted: trunk/reactos/apps/utils/net/finger/makefile
Modified: trunk/reactos/apps/utils/net/finger/net.c
Added: trunk/reactos/apps/utils/net/ftp/ftp.xml
Modified: trunk/reactos/apps/utils/net/ftp/makefile
Added: trunk/reactos/apps/utils/net/ipconfig/ipconfig.xml
Deleted: trunk/reactos/apps/utils/net/ipconfig/makefile
Deleted: trunk/reactos/apps/utils/net/netstat/makefile
Added: trunk/reactos/apps/utils/net/netstat/netstat.xml
Deleted: trunk/reactos/apps/utils/net/ping/makefile
Modified: trunk/reactos/apps/utils/net/ping/ping.c
Added: trunk/reactos/apps/utils/net/ping/ping.xml
Deleted: trunk/reactos/apps/utils/net/route/makefile
Modified: trunk/reactos/apps/utils/net/route/route.c
Added: trunk/reactos/apps/utils/net/route/route.xml
Deleted: trunk/reactos/apps/utils/net/telnet/Makefile
Added: trunk/reactos/apps/utils/net/telnet/telnet.xml
Deleted: trunk/reactos/apps/utils/net/whois/makefile
Modified: trunk/reactos/apps/utils/net/whois/whois.c
Added: trunk/reactos/apps/utils/net/whois/whois.xml
Deleted: trunk/reactos/baseaddress.cfg
Added: trunk/reactos/baseaddress.xml
Added: trunk/reactos/boot/boot.xml
Deleted: trunk/reactos/boot/freeldr/bootsect/Makefile
Added: trunk/reactos/boot/freeldr/bootsect/bootsect.xml
Deleted: trunk/reactos/boot/freeldr/freeldr/Makefile
Added: trunk/reactos/boot/freeldr/freeldr/freeldr.xml
Added: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml
Added: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml
Added: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml
Added: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml
Added: trunk/reactos/boot/freeldr/freeldr/setupldr.xml
Added: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml
Added: trunk/reactos/boot/freeldr/freeldr.xml
Added: trunk/reactos/bootdata/bootcd/
Added: trunk/reactos/bootdata/bootdata.xml
Added: trunk/reactos/bootdata/livecd/
Deleted: trunk/reactos/config
Added: trunk/reactos/config.template.xml
Added: trunk/reactos/drivers/bus/acpi/acpi.xml
Deleted: trunk/reactos/drivers/bus/acpi/makefile
Added: trunk/reactos/drivers/bus/directory.xml
Added: trunk/reactos/drivers/bus/isapnp/isapnp.xml
Deleted: trunk/reactos/drivers/bus/isapnp/makefile
Deleted: trunk/reactos/drivers/bus/pci/makefile
Added: trunk/reactos/drivers/bus/pci/pci.xml
Modified: trunk/reactos/drivers/bus/serenum/makefile
Added: trunk/reactos/drivers/bus/serenum/serenum.xml
Added: trunk/reactos/drivers/dd/beep/beep.xml
Deleted: trunk/reactos/drivers/dd/beep/makefile
Added: trunk/reactos/drivers/dd/blue/blue.xml
Deleted: trunk/reactos/drivers/dd/blue/makefile
Deleted: trunk/reactos/drivers/dd/bootvid/Makefile
Added: trunk/reactos/drivers/dd/bootvid/bootvid.xml
Added: trunk/reactos/drivers/dd/debugout/debugout.xml
Deleted: trunk/reactos/drivers/dd/debugout/makefile
Added: trunk/reactos/drivers/dd/directory.xml
Deleted: trunk/reactos/drivers/dd/mpu401/makefile
Added: trunk/reactos/drivers/dd/mpu401/mpu401.xml
Deleted: trunk/reactos/drivers/dd/null/makefile
Added: trunk/reactos/drivers/dd/null/null.xml
Deleted: trunk/reactos/drivers/dd/parallel/makefile
Added: trunk/reactos/drivers/dd/parallel/parallel.xml
Deleted: trunk/reactos/drivers/dd/ramdrv/makefile
Added: trunk/reactos/drivers/dd/ramdrv/ramdrv.rc
Added: trunk/reactos/drivers/dd/ramdrv/ramdrv.xml
Deleted: trunk/reactos/drivers/dd/serial/makefile
Added: trunk/reactos/drivers/dd/serial/serial.xml
Modified: trunk/reactos/drivers/dd/sndblst/card.c
Modified: trunk/reactos/drivers/dd/sndblst/dma.c
Modified: trunk/reactos/drivers/dd/sndblst/irq.c
Deleted: trunk/reactos/drivers/dd/sndblst/makefile
Modified: trunk/reactos/drivers/dd/sndblst/portio.c
Modified: trunk/reactos/drivers/dd/sndblst/settings.c
Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c
Added: trunk/reactos/drivers/dd/sndblst/sndblst.xml
Modified: trunk/reactos/drivers/dd/sound/dsp.c
Modified: trunk/reactos/drivers/dd/sound/dsp.h
Deleted: trunk/reactos/drivers/dd/sound/makefile
Modified: trunk/reactos/drivers/dd/sound/mixer.c
Modified: trunk/reactos/drivers/dd/sound/sound.c
Added: trunk/reactos/drivers/dd/sound/sound.xml
Modified: trunk/reactos/drivers/dd/sound/wave.c
Added: trunk/reactos/drivers/directory.xml
Added: trunk/reactos/drivers/fs/cdfs/cdfs.xml
Deleted: trunk/reactos/drivers/fs/cdfs/makefile
Added: trunk/reactos/drivers/fs/directory.xml
Added: trunk/reactos/drivers/fs/fs_rec/fs_rec.xml
[truncated at 100 lines; 481 more skipped] 
Property changes on: trunk/reactos
___________________________________________________________________
Name: svn:ignore
   - dist
reactos
*.sys
*.exe
*.dll
*.cpl
*.a
*.o
*.d
*.coff
*.dsp
*.dsw
*.aps
*.ncb
*.opt
*.sym
*.plg
*.bak
*.zip
*.iso
*.cab
doxy-doc
   + *.sys
*.exe
*.dll
*.cpl
*.a
*.o
*.d
*.coff
*.dsp
*.dsw
*.aps
*.ncb
*.opt
*.sym
*.plg
*.bak
*.zip
*.iso
*.cab
*.bat
*.log
makefile.auto
config.xml
obj-*
output-*
doxy-doc
cd
reactos
  _____  

Modified: trunk/reactos/INSTALL
--- trunk/reactos/INSTALL	2005-05-28 15:14:29 UTC (rev 15582)
+++ trunk/reactos/INSTALL	2005-05-28 15:18:30 UTC (rev 15583)
@@ -7,67 +7,72 @@

 
 2. Building ReactOS
 
-To build from Windows run 'make' (wihout the quotes) from the top
directory.
-To build from unix, edit rules.mak and change the PREFIX variable to
the
-correct value for your cross-compiler. Run 'export HOST=mingw32-linux'
to
-tell the ReactOS build system that it is building ReactOS on a linux
machine.
-Now run 'make'.
+2.1 Building the binaries
 
+To build ReactOS run 'make' (wihout the quotes) if you are building on
Linux
+or 'mingw32-make' if you are building on Windows (or ReactOS) from the
top
+directory.
 
+
+2.2 Building a bootable CD image
+
+To build a bootable CD image run 'make bootcd' (wihout the quotes) if
you are
+building on Linux or 'mingw32-make bootcd' if you are building on
Windows (or
+ReactOS) from the top directory. This will create a CD image with a
filename,
+ReactOS.iso, in the top directory.
+
+
 3. Installation
 
-The system can only be installed on the first partition on the first
harddisk.
-The partition must be formatted as FAT16 or FAT32. The system can only
be
-started from DOS and not from a Windows DOS-prompt.
+ReactOS can only be installed on a machine that has a FAT16 or FAT32
partition
+as the active (bootable) partition. The partition on which ReactOS is
to be
+installed (which may or may not be the bootable partition) must also be
+formatted as FAT16 or FAT32. ReactOS Setup can format the partitions if
+needed.
 
-ReactOS can be installed from the source distribution or from the
binary
+ReactOS can be installed from the source distribution or from the
bootable CD
 distribution. The two ways to install ReactOS are explained below.
 
 
 3.1 Installation from sources
 
-To install ReactOS after building it, type 'make install'. This will
create
-the directory 'reactos' in the top directory. Copy this directory to
the root
-of your first partition on your first harddisk. This is usually c:\ on
a
-Windows machine.
+If you don't have an existing ReactOS installation you want to upgrade,
then
+build a bootable CD as described above. Burn the CD image, boot from
it, and
+follow the instructions to install ReactOS.
 
-If you don't want to copy the files manually every time you run a 'make
install',
-you can specify the directory where the files are to be copied to
during
-installation.
+If you have an existing ReactOS installation you want to upgrade, then
to
+install ReactOS after building it, type 'make install' or
+'mingw32-make install'. This will create the directory 'reactos' in the
top
+directory. Copy the contents of this directory over the existing
installation.
 
-In rules.mak find the variable INSTALL_DIR and change the assigned
value to the
-name of the directory where the files are to be copied to. If you are
using
-Windows this could be:
+If you don't want to copy the files manually every time you run a
+'make install' or 'mingw32-make install', then you can specify the
directory
+where the files are to be copied to during installation.
 
-    INSTALL_DIR = c:\reactos
+Set the ROS_INSTALL environment variable. If you are on Windows this
could be
+done by:
 
-If you are on linux this could be:
+  set ROS_INSTALL=c:\reactos
 
-    INSTALL_DIR = /mnt/windows/reactos
+If you are on Linux this could be done by:
 
-Save the changes to rules.mak and run 'make install' to install the
files to
-the new location. If you don't want to change rules.mak, you can
specify the
-installtion directory when invoking make. Run
-'make INSTALL_DIR=c:\reactos install' to install to c:\reactos.
+  export ROS_INSTALL=/mnt/windows/reactos
 
+Now run 'make install' or 'mingw32-make install' to install the files
to the
+new location.
 
-3.2 Installation from binany distribution
 
-To install ReactOS from the binary distribution, extract the archive
contents
-to c:\reactos. Remember to extract the files with full paths.
+3.2 Installation from bootable CD distribution
 
+To install ReactOS from the bootable CD distribution, extract the
archive
+contents. Then burn the CD image, boot from it, and follow
instructions.
 
-4. Booting ReactOS
 
-Startup in DOS mode. 'cd' to c:\reactos and type 'boot' and press
<enter>.
-A simple shell is started where you can use simple commands like 'cd'
and 'dir'.
-
-
 5. Help
 
 If you run into problems or have suggestions for making ReactOS better,
please
-surf to the address below and subscribe to one or more of the mailing
lists.
+visit the address below and subscribe to one or more of the mailing
lists.
 
-http://www.reactos.com/index.php?tab=discussion&section=lists
+http://www.reactos.com/en/content/view/full/66
 
 ReactOS Development Team
  _____  

Deleted: trunk/reactos/Jamfile
--- trunk/reactos/Jamfile	2005-05-28 15:14:29 UTC (rev 15582)
+++ trunk/reactos/Jamfile	2005-05-28 15:18:30 UTC (rev 15583)
@@ -1,5 +0,0 @@

-# Main jamfile for ReactOS
-
-SubDir ROS_TOP ;
-
-SubInclude ROS_TOP Lib ;
  _____  

Deleted: trunk/reactos/Jamrules
--- trunk/reactos/Jamrules	2005-05-28 15:14:29 UTC (rev 15582)
+++ trunk/reactos/Jamrules	2005-05-28 15:18:30 UTC (rev 15583)
@@ -1,54 +0,0 @@

-# customization for ReactOS goes here
-
-# The SharedLibrary and SharedLibraryFromObjects rules were
-# borrowed from here:
-#
http://www.differentpla.net/~roger/devel/jam/tutorial/shared_lib/index.h
tml
-
-SUFSHR = .dll ;
-RM = rm ; # rm comes with MinGW, and the default del doesn't work in
some cases
-
-rule SharedLibrary
-{
-	SharedLibraryFromObjects $(<) : $(>:S=$(SUFOBJ)) ;
-	Objects $(>) ;
-}
-
-rule SharedLibraryFromObjects
-{
-	local _s _t ;
-
-	# Add grist to file names
-	# Add suffix to dll
-
-	_s = [ FGristFiles $(>) ] ;
-	_t = [ FAppendSuffix $(<) : $(SUFSHR) ] ;
-
-	if $(_t) != $(<)
-	{
-	    DEPENDS $(<) : $(_t) ;
-	    NOTFILE $(<) ;
-	}
-
-	# make compiled sources a dependency of target
-
-	DEPENDS exe : $(_t) ;
-	DEPENDS $(_t) : $(_s) ;
-	MakeLocate $(_t) : $(LOCATE_TARGET) ;
-
-	Clean clean : $(_t) ;
-
-	Link $(_t) : $(_s) ;
-}
-
-# nasm needs to know the output file first, or it doesn't
-# recognize -I  :(
-actions As
-{
-	$(AS) -o $(<) $(ASFLAGS) -I$(HDRS) $(>)
-}
-
-AS = nasm ;
-
-# why isn't DEFINES working? :(
-#DEFINES += _M_IX86 ;
-CCFLAGS += -D_M_IX86 ;
  _____  

Modified: trunk/reactos/Makefile
--- trunk/reactos/Makefile	2005-05-28 15:14:29 UTC (rev 15582)
+++ trunk/reactos/Makefile	2005-05-28 15:18:30 UTC (rev 15583)
@@ -1,1089 +1,258 @@

-# $Id$
+# Accepted environment variables:
 #
-# Global makefile
+#    ROS_PREFIX
+#        This variable specifies the prefix of the MinGW installation.
On Windows
+#        a prefix is usually not needed, but on linux it is usually
"mingw32-". If
+#        not present and no executable named "gcc" can be found, then
the prefix is
+#        assumed to be "mingw32-".
 #
+#    ROS_INTERMEDIATE
+#        This variable controls where to put intermediate files.
Intermediate
+#        files are generated files that are needed to generate the
final
+#        output files. Examples of intermediate files include *.o, *.a,
and
+#        *.coff. N.B. Don't put a path separator at the end. The
variable
+#        defaults to .\obj-i386.
+#
+#    ROS_OUTPUT
+#        This variable controls where to put output files. Output files
are
+#        generated files that makes up the result of the build process.
+#        Examples of output files include *.exe, *.dll, and *.sys. N.B.
Don't
+#        put a path separator at the end. The variable defaults to
.\output-i386.
+#
+#    ROS_TEMPORARY
+#        This variable controls where to put temporary files. Temporary
files
+#        are (usually small) generated files that are needed to
generate the
+#        intermediate or final output files. Examples of temporary
files include
+#        *.rci (preprocessed .rc files for wrc), *.tmp, and *.exp. N.B.
Don't put
+#        a path separator at the end. The variable defaults to the
current
+#        directory.
+#
+#    ROS_INSTALL
+#        This variable controls where to install output files to when
using
+#        'make install'. N.B. Don't put a path separator at the end.
The variable
+#        defaults to .\reactos.
+#
+#    ROS_BUILDMAP
+#        This variable controls if map files are to be generated for
executable
+#        output files. Map files have the extension .map. The value can
be either
+#        full (to build map files with assembly code), yes (to build
map files
+#        without source code) or no (to not build any map files). The
variable
+#        defaults to no.
+#
+#    ROS_BUILDNOSTRIP
+#        This variable controls if non-symbol-stripped versions are to
be built
+#        of executable output files. Non-symbol-stripped executable
output files
+#        have .nostrip added to the filename just before the extension.
The value
+#        can be either yes (to build non-symbol-stripped versions of
executable
+#        output files) or no (to not build non-symbol-stripped versions
of
+#        executable output files). The variable defaults to no.
+#
+#    ROS_RBUILDFLAGS
+#        Pass parameters to rbuild.
 
-PATH_TO_TOP = .
+.PHONY: all
+.PHONY: clean
+all: makefile.auto
 
-include $(PATH_TO_TOP)/rules.mak
-include $(PATH_TO_TOP)/config
+.SUFFIXES:
 
-#
-# Define to build ReactOS external targets
-#
-ifeq ($(ROS_BUILD_EXT),)
-ROS_BUILD_EXT = no
+ifeq ($(HOST),)
+ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+HOST=mingw32-windows
 else
-ROS_BUILD_EXT = yes
+HOST=mingw32-linux
 endif
+endif
 
-ifneq ($(MINIMALDEPENDENCIES),no)
-IMPLIB =
+# Default to half-verbose mode
+ifeq ($(VERBOSE),no)
+  Q = @
+  HALFVERBOSEECHO = no
+  BUILDNO_QUIET = -q
 else
-IMPLIB = implib
+ifeq ($(VERBOSE),yes)
+  Q =
+  HALFVERBOSEECHO = no
+  BUILDNO_QUIET =
+else
+  Q = @
+  HALFVERBOSEECHO = yes
+  BUILDNO_QUIET = -q
 endif
+endif
+ifeq ($(HALFVERBOSEECHO),yes)
+  ECHO_CP      =@echo [COPY]     $@
+  ECHO_MKDIR   =@echo [MKDIR]    $@
+  ECHO_BUILDNO =@echo [BUILDNO]  $@
+  ECHO_INVOKE  =@echo [INVOKE]   $<
+  ECHO_PCH     =@echo [PCH]      $@
+  ECHO_CC      =@echo [CC]       $<
+  ECHO_GAS     =@echo [GAS]      $<
+  ECHO_NASM    =@echo [NASM]     $<
+  ECHO_AR      =@echo [AR]       $@
+  ECHO_WINEBLD =@echo [WINEBLD]  $@
+  ECHO_WRC     =@echo [WRC]      $@
+  ECHO_WIDL    =@echo [WIDL]     $@
+  ECHO_BIN2RES =@echo [BIN2RES]  $<
+  ECHO_DLLTOOL =@echo [DLLTOOL]  $@
+  ECHO_LD      =@echo [LD]       $@
+  ECHO_NM      =@echo [NM]       $@
+  ECHO_OBJDUMP =@echo [OBJDUMP]  $@
+  ECHO_RBUILD  =@echo [RBUILD]   $@
+  ECHO_RSYM    =@echo [RSYM]     $@
+  ECHO_WMC     =@echo [WMC]      $@
+  ECHO_NCI     =@echo [NCI]      $@
+  ECHO_CABMAN  =@echo [CABMAN]   $<
+  ECHO_CDMAKE  =@echo [CDMAKE]   $@
+  ECHO_MKHIVE  =@echo [MKHIVE]   $@
+  ECHO_REGTESTS=@echo [REGTESTS] $@
+  ECHO_TEST    =@echo [TEST]     $@
+else
+  ECHO_CP      =
+  ECHO_MKDIR   =
+  ECHO_BUILDNO =
+  ECHO_INVOKE  =
+  ECHO_PCH     =
+  ECHO_CC      =
+  ECHO_GAS     =
+  ECHO_NASM    =
+  ECHO_AR      =
+  ECHO_WINEBLD =
+  ECHO_WRC     =
+  ECHO_WIDL    =
+  ECHO_BIN2RES =
+  ECHO_DLLTOOL =
+  ECHO_LD      =
+  ECHO_NM      =
+  ECHO_OBJDUMP =
+  ECHO_RBUILD  =
+  ECHO_RSYM    =
+  ECHO_WMC     =
+  ECHO_NCI     =
+  ECHO_CABMAN  =
+  ECHO_CDMAKE  =
+  ECHO_MKHIVE  =
+  ECHO_REGTESTS=
+  ECHO_TEST    =
+endif
 
-# Boot loaders
-BOOT_LOADERS = freeldr
 
-# Required to run the system
-COMPONENTS = ntoskrnl
+host_gcc = $(Q)gcc
+host_gpp = $(Q)g++
+host_ld = $(Q)ld
+host_ar = $(Q)ar
+host_objcopy = $(Q)objcopy
+ifeq ($(HOST),mingw32-linux)
+	EXEPREFIX = ./
+	EXEPOSTFIX =
+	SEP = /
+	mkdir = -$(Q)mkdir -p
+	gcc = $(Q)mingw32-gcc
+	gpp = $(Q)mingw32-g++
+	ld = $(Q)mingw32-ld
+	nm = $(Q)mingw32-nm
+	objdump = $(Q)mingw32-objdump
+	ar = $(Q)mingw32-ar
+	objcopy = $(Q)mingw32-objcopy
+	dlltool = $(Q)mingw32-dlltool
+	windres = $(Q)mingw32-windres
+	rm = $(Q)rm -f
+	cp = $(Q)cp
+	NUL = /dev/null
+else # mingw32-windows
+	EXEPREFIX =
+	EXEPOSTFIX = .exe
+	ROS_EMPTY =
+	SEP = \$(ROS_EMPTY)
+	mkdir = -$(Q)mkdir
+	gcc = $(Q)gcc
+	gpp = $(Q)g++
+	ld = $(Q)ld
+	nm = $(Q)nm
+	objdump = $(Q)objdump
+	ar = $(Q)ar
+	objcopy = $(Q)objcopy
+	dlltool = $(Q)dlltool
+	windres = $(Q)windres
+	rm = $(Q)del /f /q
+	cp = $(Q)copy /y
+	NUL = NUL
+endif
 
-# Hardware Abstraction Layers
-# halx86
-HALS = halx86/up halx86/mp
+ifneq ($(ROS_INTERMEDIATE),)
+  INTERMEDIATE := $(ROS_INTERMEDIATE)
+else
+  INTERMEDIATE := obj-i386
+endif
+INTERMEDIATE_ := $(INTERMEDIATE)$(SEP)
 
-# Bus drivers
-# acpi isapnp pci serenum
-BUS = acpi isapnp pci serenum
+ifneq ($(ROS_OUTPUT),)
+  OUTPUT := $(ROS_OUTPUT)
+else
+  OUTPUT := output-i386
+endif
+OUTPUT_ := $(OUTPUT)$(SEP)
 
-# Filesystem libraries
-# vfatlib
-LIB_FSLIB = vfatlib
-
-# libunicode, must be empty!
-LIBUNICODE = 
-
-# Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh
adns dxguid strmiids crt rossym wdmguid
-
-# Keyboard layout libraries
-DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdru kbdse kbdsg kbduk kbdus
-
-# Control Panels
-DLLS_CPL = cpl
-
-# Shell extensions
-DLLS_SHELLEXT = shellext
-
-# User mode libraries
-# libpcap packet epsapi
-DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll
comdlg32 d3d8thk dbghelp expat fmifs freetype \
-	gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32
lzexpand mesa32 midimap mmdrv mpr msacm msafd \
-	msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32
oleaut32 oledlg olepro32 opengl32 \
-	packet psapi riched20 richedit rpcrt4 samlib secur32 serialui
setupapi shell32 shlwapi smlib smdll snmpapi \
-	syssetup twain user32 userenv version wininet winmm winspool
ws2help ws2_32 wsock32 wshirda dnsapi \
-	urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv
dhcpcapi \
-	$(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
-
-SUBSYS = smss win32k csrss ntvdm
-
-#
-# Select the server(s) you want to build
-#
-#SERVERS = posix linux os2
-SERVERS = win32
-
-# Driver support libraries
-#bzip2 zlib oskittcp
-DRIVERS_LIB = bzip2 oskittcp ip csq
-
-# Kernel mode device drivers
-# Obsolete: ide
-# beep blue floppy null parallel ramdrv serenum serial
-DEVICE_DRIVERS = beep blue debugout null serial bootvid
-
-# Kernel mode input drivers
-INPUT_DRIVERS = mouclass sermouse i8042prt kbdclass
-
-# Kernel mode file system drivers
-# cdfs ext2 fs_rec ms np vfat
-FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
-
-# Kernel mode networking drivers
-# afd ndis npf tcpip tdi wshtcpip
-NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
-
-# Kernel mode networking device drivers
-# ne2000 pcnet
-NET_DEVICE_DRIVERS = ne2000 pcnet
-
-# Kernel mode storage drivers
-# atapi cdrom class2 disk scsiport
-STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
-
-# System applications
-# autochk cmd format services setup usetup welcome winlogon msiexec 
-SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec
regsvr32 \
-  reporterror services setup taskmgr userinit usetup welcome vmwinst
rundll32 \
-  winlogon regedit winefile notepad reactos lsass dhcp sm
-
-# System services
-SYS_SVC = rpcss eventlog umpnpmgr
-
-APPS = testsets utils
-
-
-# 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)
+ifneq ($(ROS_TEMPORARY),)
+  TEMPORARY := $(ROS_TEMPORARY)
 else
-EXT_MODULES =
+  TEMPORARY :=
 endif
+TEMPORARY_ := $(TEMPORARY)$(SEP)
 
-KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS)
$(FS_DRIVERS) \
-	$(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
VIDEO_DRIVERS USB_DRIVERS
-
-# Regression tests
-REGTESTS = regtests
-
-all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS)
$(LIB_FSLIB) \
-     $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS)
$(EXT_MODULES)
-
-bootstrap: dk implib iface_native
-
-depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends)
msvcrt_depends $(DLLS:%=%_depends) \
-         $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
-         $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
-
-implib: hallib $(LIB_STATIC) $(LIB_FSLIB) $(COMPONENTS:%=%_implib)
$(HALS:%=%_implib) \
-        $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib)
$(LIB_FSLIB:%=%_implib) \
-        msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \
-        $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib)
$(SYS_SVC:%=%_implib) \
-        $(EXT_MODULES:%=%_implib) $(REGTESTS:%=%_implib)
-
-test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test)
$(BUS:%=%_test) \
-	    $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test
$(DLLS:%=%_test) \
-	    $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \
-	    $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test)
-
-clean: tools dk_clean iface_native_clean hallib_clean \
-       $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean)
$(COMPONENTS:%=%_clean) \
-       $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean)
\
-       msvcrt_clean $(DLLS:%=%_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:
-	$(HALFVERBOSEECHO) [RM]      /include/roscfg.h
-	$(RM) $(PATH_TO_TOP)/include/roscfg.h
-
-fastinstall: tools install_dirs install_before
$(COMPONENTS:%=%_install) $(HALS:%=%_install) \
-         $(BUS:%=%_install) $(LIB_STATIC:%=%_install)
$(LIB_FSLIB:%=%_install) \
-         msvcrt_install $(DLLS:%=%_install)
$(KERNEL_DRIVERS:%=%_install) \
-         $(SUBSYS:%=%_install) $(SYS_APPS:%=%_install)
$(SYS_SVC:%=%_install) \
-         $(APPS:%=%_install) $(EXT_MODULES:%=%_install)
$(REGTESTS:%=%_install)
-install: fastinstall registry
-
-FREELDR_DIR = boot/freeldr
-
-bootcd_directory_layout:
-	$(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)
-	$(RMKDIR) $(BOOTCD_DIR)
-	$(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/bootdisk
-	$(RMKDIR) $(BOOTCD_DIR)/bootdisk
-	$(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/loader
-	$(RMKDIR) $(BOOTCD_DIR)/loader
-	$(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/reactos
-	$(RMKDIR) $(BOOTCD_DIR)/reactos
-	$(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/reactos/system32
-	$(RMKDIR) $(BOOTCD_DIR)/reactos/system32
-
-bootcd_bootstrap_files: $(BOOT_LOADERS:%=%_bootcd)
$(COMPONENTS:%=%_bootcd) \
-	$(HALS:%=%_bootcd) $(BUS:%=%_bootcd) $(LIB_STATIC:%=%_bootcd) \
-	$(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \
-	$(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd)
$(SYS_APPS:%=%_bootcd)
-
-bootcd_install_before:
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/autorun.inf to
$(BOOTCD_DIR)/autorun.inf
-	$(RLINE) bootdata/autorun.inf $(BOOTCD_DIR)/autorun.inf
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/readme.txt to
$(BOOTCD_DIR)/readme.txt
-	$(RLINE) bootdata/readme.txt $(BOOTCD_DIR)/readme.txt
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/hivecls.inf to
$(BOOTCD_DIR)/reactos/hivecls.inf
-	$(RLINE) bootdata/hivecls.inf $(BOOTCD_DIR)/reactos/hivecls.inf
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/hivedef.inf to
$(BOOTCD_DIR)/reactos/hivedef.inf
-	$(RLINE) bootdata/hivedef.inf $(BOOTCD_DIR)/reactos/hivedef.inf
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/hivesft.inf to
$(BOOTCD_DIR)/reactos/hivesft.inf
-	$(RLINE) bootdata/hivesft.inf $(BOOTCD_DIR)/reactos/hivesft.inf
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/hivesys.inf to
$(BOOTCD_DIR)/reactos/hivesys.inf
-	$(RLINE) bootdata/hivesys.inf $(BOOTCD_DIR)/reactos/hivesys.inf
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/txtsetup.sif to
$(BOOTCD_DIR)/reactos/txtsetup.sif
-	$(RLINE) bootdata/txtsetup.sif
$(BOOTCD_DIR)/reactos/txtsetup.sif
-	$(HALFVERBOSEECHO) [COPY]    bootdata/icon.ico to
$(BOOTCD_DIR)/icon.ico
-	$(CP) bootdata/icon.ico $(BOOTCD_DIR)/icon.ico
-	$(HALFVERBOSEECHO) [COPY]    subsys/system/welcome/welcome.exe
to $(BOOTCD_DIR)/reactos/welcome.exe
-	$(CP) subsys/system/welcome/welcome.exe
$(BOOTCD_DIR)/reactos/welcome.exe
-	$(HALFVERBOSEECHO) [COPY]    subsys/system/reactos/reactos.exe
to $(BOOTCD_DIR)/reactos/reactos.exe
-	$(CP) subsys/system/reactos/reactos.exe
$(BOOTCD_DIR)/reactos/reactos.exe
-	$(HALFVERBOSEECHO) [COPY]    media/nls/c_1252.nls to
$(BOOTCD_DIR)/reactos/c_1252.nls
-	$(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls
-	$(HALFVERBOSEECHO) [COPY]    media/nls/c_437.nls to
$(BOOTCD_DIR)/reactos/c_437.nls
-	$(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
-	$(HALFVERBOSEECHO) [COPY]    media/nls/l_intl.nls to
$(BOOTCD_DIR)/reactos/l_intl.nls
-	$(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
-	$(HALFVERBOSEECHO) [COPY]    media/drivers/etc/services to
$(BOOTCD_DIR)/reactos/services
-	$(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
-	$(HALFVERBOSEECHO) [COPY]    media/drivers/etc/KDBinit to
$(BOOTCD_DIR)/reactos/KDBinit
-	$(CP) media/drivers/etc/KDBinit $(BOOTCD_DIR)/reactos/KDBinit
-
-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
-	$(HALFVERBOSEECHO) [CDMAKE]  ReactOS.iso
-	$(CDMAKE) -v -m -b $(BOOTCD_DIR)/../isoboot.bin $(BOOTCD_DIR)
REACTOS ReactOS.iso
-
-ubootcd_unattend:
-	$(HALFVERBOSEECHO) [COPY]    bootdata/unattend.inf to
$(BOOTCD_DIR)/reactos/unattend.inf
-	$(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
-
-livecd_directory_layout:
-	$(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)
-	$(RMKDIR) $(LIVECD_DIR)
-	$(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/loader
-	$(RMKDIR) $(LIVECD_DIR)/loader
-	$(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/reactos
-	$(RMKDIR) $(LIVECD_DIR)/reactos
-	$(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/All\
Users/Desktop
-	$(RMKDIR) $(LIVECD_DIR)/Profiles/All\ Users/Desktop
-	$(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/Default\
User/Desktop
-	$(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/Desktop
-	$(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/Default\
User/My\ Documents
-	$(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
-	$(HALFVERBOSEECHO) [COPY]    ${FREELDR_DIR}/bootsect/isoboot.bin
to ${LIVECD_DIR}/../isoboot.bin
-	$(CP) ${FREELDR_DIR}/bootsect/isoboot.bin
${LIVECD_DIR}/../isoboot.bin
-	$(HALFVERBOSEECHO) [COPY]    ${FREELDR_DIR}/freeldr/freeldr.sys
to ${LIVECD_DIR}/loader/setupldr.sys
-	$(CP) ${FREELDR_DIR}/freeldr/freeldr.sys
${LIVECD_DIR}/loader/setupldr.sys
-	$(HALFVERBOSEECHO) [RLINE]   bootdata/livecd.ini to
$(LIVECD_DIR)/freeldr.ini
-	$(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini
-
-livecd_bootstrap_files:
-	$(MAKE) LIVECD_INSTALL=yes fastinstall
-
-livecd_install_before:
-	$(MKHIVE) 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:
-	$(HALFVERBOSEECHO) [CDMAKE]  roslive.iso
-	$(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
-	$(MKHIVE) bootdata $(INSTALL_DIR)/system32/config
bootdata/hiveinst.inf
-
-.PHONY: all bootstrap depends implib test clean clean_before install
bootcd_directory_layout \
-bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd
ubootcd_unattend bootcd
-
-
-#
-# Boot Loaders
-#
-$(BOOT_LOADERS): %:
-	$(MAKE) -C boot/$*
-
-$(BOOT_LOADERS:%=%_test): %_test:
-	$(MAKE) -C boot/$* test
-
-$(BOOT_LOADERS:%=%_clean): %_clean:
-	$(MAKE) -C boot/$* clean
-
-$(BOOT_LOADERS:%=%_bootcd): %_bootcd:
-	$(MAKE) -C boot/$* bootcd
-
-.PHONY: $(BOOT_LOADERS) $(BOOT_LOADERS:%=%_test)
$(BOOT_LOADERS:%=%_clean) \
-        $(BOOT_LOADERS:%=%_bootcd)
-
-$(COMPONENTS): dk
-
-#
-# System Applications
-#
-$(SYS_APPS): %: $(IMPLIB)
-	$(MAKE) -C subsys/system/$*
-
-$(SYS_APPS:%=%_implib): %_implib: dk
-	$(MAKE) --silent -C subsys/system/$* implib
-
-$(SYS_APPS:%=%_test): %_test:
-	$(MAKE) -C subsys/system/$* test
-
-$(SYS_APPS:%=%_clean): %_clean:
-	$(MAKE) -C subsys/system/$* clean
-
-$(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:%=%_test) \
-  $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd)
-
-#
-# System Services
-#
-$(SYS_SVC): %: $(IMPLIB)
-	$(MAKE) -C services/$*
-
-$(SYS_SVC:%=%_depends): %_depends:
-	$(MAKE) -C services/$* depends
-
-$(SYS_SVC:%=%_implib): %_implib: dk
-	$(MAKE) --silent -C services/$* implib
-
-$(SYS_SVC:%=%_test): %_test:
-	$(MAKE) -C services/$* test
-
-$(SYS_SVC:%=%_clean): %_clean:
-	$(MAKE) -C services/$* clean
-
-$(SYS_SVC:%=%_install): %_install:
-	$(MAKE) -C services/$* install
-
-.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) \
-  $(SYS_SVC:%=%_test) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install)
-
-
-#
-# Applications
-#
-#
-# Extra (optional system) Applications
-#
-$(APPS): %: $(IMPLIB)
-	$(MAKE) -C apps/$*
-
-# Not needed
-# $(APPS:%=%_implib): %_implib: dk
-#	$(MAKE) --silent -C apps/$* implib
-
-$(APPS:%=%_test): %_test:
-	$(MAKE) -C apps/$* test
-
-$(APPS:%=%_clean): %_clean:
-	$(MAKE) -C apps/$* clean
-
-$(APPS:%=%_install): %_install:
-	$(MAKE) -C apps/$* install
-
-.PHONY: $(APPS) $(APPS:%=%_test) $(APPS:%=%_clean) $(APPS:%=%_install)
-
-
-#
-# External ports and subsystem personalities
-#
-$(EXTERNALS): %:
-	$(MAKE) -C $(ROOT_PATH)/$*
-
-$(EXTERNALS:%=%_depends): %_depends:
-	$(MAKE) -C $(ROOT_PATH)/$* depends
-
-$(EXTERNALS:%=%_implib): %_implib: dk
-	$(MAKE) --silent -C $(ROOT_PATH)/$* implib
-
-$(EXTERNALS:%=%_clean): %_clean:
-	$(MAKE) -C $(ROOT_PATH)/$* clean
-
-$(EXTERNALS:%=%_install): %_install:
-	$(MAKE) -C $(ROOT_PATH)/$* install
-
-.PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib)
$(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install)
-
-
-#
-# Tools
-#
-tools:
-	$(MAKE) --silent -C tools
-
-tools_implib:
-	
-
-tools_test:
-	
-
-tools_clean:
-	$(MAKE) -C tools clean
-
-tools_install:
-
-.PHONY: tools tools_implib tools_test tools_clean tools_install
-
-
-#
-# Developer Kits
-#
-dk: tools
-	@$(RMKDIR) $(DK_PATH)
-	@$(RMKDIR) $(DDK_PATH)
-	@$(RMKDIR) $(DDK_PATH_LIB)
-	@$(RMKDIR) $(DDK_PATH_INC)
-	@$(RMKDIR) $(SDK_PATH)
-	@$(RMKDIR) $(SDK_PATH_LIB)
-	@$(RMKDIR) $(SDK_PATH_INC)
-	@$(RMKDIR) $(XDK_PATH)
-	@$(RMKDIR) $(XDK_PATH_LIB)
-#	@$(RMKDIR) $(XDK_PATH_INC)
-
-dk_implib:
-
-# WARNING! Be very sure that there are no important files
-#          in these directories before cleaning them!!!
-dk_clean:
-	$(HALFVERBOSEECHO) [RM]      $(DDK_PATH_LIB)/*.a
-	$(RM) $(DDK_PATH_LIB)/*.a
-#	$(HALFVERBOSEECHO) [RM]      $(DDK_PATH_INC)/*.h
-#	$(RM) $(DDK_PATH_INC)/*.h
-	$(HALFVERBOSEECHO) [RMDIR]   $(DDK_PATH_LIB)
-	$(RMDIR) $(DDK_PATH_LIB)
-#	$(HALFVERBOSEECHO) [RMDIR]   $(DDK_PATH_INC)
-#	$(RMDIR) $(DDK_PATH_INC)
-	$(HALFVERBOSEECHO) [RM]      $(SDK_PATH_LIB)/*.a
-	$(RM) $(SDK_PATH_LIB)/*.a
-#	$(HALFVERBOSEECHO) [RM]      $(SDK_PATH_INC)/*.h
-#	$(RM) $(SDK_PATH_INC)/*.h
-	$(HALFVERBOSEECHO) [RMDIR]   $(SDK_PATH_LIB)
-	$(RMDIR) $(SDK_PATH_LIB)
-#	$(HALFVERBOSEECHO) [RMDIR]   $(SDK_PATH_INC)
-#	$(RMDIR) $(SDK_PATH_INC)
-	$(HALFVERBOSEECHO) [RM]      $(XDK_PATH_LIB)/*.a
-	$(RM) $(XDK_PATH_LIB)/*.a
-#	$(HALFVERBOSEECHO) [RM]      $(XDK_PATH_INC)/*.h
-#	$(RM) $(XDK_PATH_INC)/*.h
-	$(HALFVERBOSEECHO) [RMDIR]   $(XDK_PATH_LIB)
-	$(RMDIR) $(XDK_PATH_LIB)
-#	$(HALFVERBOSEECHO) [RMDIR]   $(XDK_PATH_INC)
-#	$(RMDIR) $(XDK_PATH_INC)
-
-dk_install:
-
-.PHONY: dk dk_implib dk_clean dk_install
-
-
-#
-# Interfaces
-#
-iface_native:
-	$(MAKE) --silent -C tools/nci
-
-iface_native_implib:
-	
-iface_native_test:
-	
-iface_native_clean:
-	$(MAKE) --silent -C tools/nci clean
-
-iface_native_install:
-
-iface_native_bootcd:
-
-.PHONY: iface_native iface_native_implib iface_native_test
iface_native_clean \
-        iface_native_install iface_native_bootcd
-
-
-#
-# Bus driver rules
-#
-$(BUS): %: $(IMPLIB)
-	$(MAKE) -C drivers/bus/$*
-
-$(BUS:%=%_implib): %_implib: dk
-	$(MAKE) --silent -C drivers/bus/$* implib
-
-$(BUS:%=%_test): %_test:
-	$(MAKE) -C drivers/bus/$* test
-
-$(BUS:%=%_clean): %_clean:
-	$(MAKE) -C drivers/bus/$* clean
-
-$(BUS:%=%_install): %_install:
-	$(MAKE) -C drivers/bus/$* install
-
-$(BUS:%=%_bootcd): %_bootcd:
-	$(MAKE) -C drivers/bus/$* bootcd
-
-.PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
-        $(BUS:%=%_install) $(BUS:%=%_bootcd)
-
-
-#
-# Driver support libraries rules
-#
-$(DRIVERS_LIB): %: $(IMPLIB)
-	$(MAKE) -C drivers/lib/$*
-
-$(DRIVERS_LIB:%=%_implib): %_implib: dk
-	$(MAKE) --silent -C drivers/lib/$* implib
-
-$(DRIVERS_LIB:%=%_test): %_test:
-	$(MAKE) -C drivers/lib/$* test
-
-$(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:%=%_test) \
-        $(DRIVERS_LIB:%=%_clean) $(DRIVERS_LIB:%=%_install)
$(DRIVERS_LIB:%=%_bootcd)
-
-
-#
-# Device driver rules
-#
-$(DEVICE_DRIVERS): %: $(IMPLIB)
-	$(MAKE) -C drivers/dd/$*
-
-$(DEVICE_DRIVERS:%=%_implib): %_implib: dk
-	$(MAKE) --silent -C drivers/dd/$* implib
-
-$(DEVICE_DRIVERS:%=%_test): %_test:
-	$(MAKE) -C drivers/dd/$* test
-
-$(DEVICE_DRIVERS:%=%_clean): %_clean:
-	$(MAKE) -C drivers/dd/$* clean
-
-$(DEVICE_DRIVERS:%=%_install): %_install:
-	$(MAKE) -C drivers/dd/$* install
-
-$(DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
-	$(MAKE) -C drivers/dd/$* bootcd
-
-.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib)
$(DEVICE_DRIVERS:%=%_test) \
-        $(DEVICE_DRIVERS:%=%_clean) $(DEVICE_DRIVERS:%=%_install)
$(DEVICE_DRIVERS:%=%_bootcd)
-
-
-#
-# Video device driver rules
-#
-VIDEO_DRIVERS: $(IMPLIB)
-	$(MAKE) -C drivers/video
-
-VIDEO_DRIVERS_implib: dk
-	$(MAKE) --silent -C drivers/video implib
-
-VIDEO_DRIVERS_test:
-	$(MAKE) -C drivers/video test
-
-VIDEO_DRIVERS_clean:
-	$(MAKE) -C drivers/video clean
-
[truncated at 1000 lines; 21923 more skipped]