From daf565ab212155715ff1185a39e2ea5e3fb7175d Mon Sep 17 00:00:00 2001
From: Maarten Bosma <maarten@bosma.de>
Date: Fri, 17 Feb 2006 13:44:13 +0000
Subject: [PATCH] Fix some build files

svn path=/trunk/; revision=21073
---
 reactos/ReactOS.rbuild                        |   2 -
 reactos/lib/lib.rbuild                        | 107 +++++++++---------
 reactos/subsys/subsys.rbuild                  |   9 --
 reactos/subsys/system/directory.xml           |  66 ++++++-----
 reactos/subsystems/subsystems.rbuild          |  10 ++
 .../win32/csrss/{csrss.xml => csrss.rbuild}   |   0
 reactos/subsystems/win32/win32.rbuild         |  10 ++
 .../win32k/{win32k.xml => win32k.rbuild}      |   0
 reactos/tools/gendib/gendib.mak               |   2 +-
 reactos/tools/nci/nci.mak                     |   2 +-
 10 files changed, 112 insertions(+), 96 deletions(-)
 create mode 100644 reactos/subsystems/subsystems.rbuild
 rename reactos/subsystems/win32/csrss/{csrss.xml => csrss.rbuild} (100%)
 create mode 100644 reactos/subsystems/win32/win32.rbuild
 rename reactos/subsystems/win32/win32k/{win32k.xml => win32k.rbuild} (100%)

diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index 88b6b531fa5..ac3ecc28917 100644
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -90,10 +90,8 @@
   <directory name="subsys">
     <xi:include href="subsys/subsys.rbuild" />
   </directory>
-<!-- NOT DONE YET
   <directory name="subsystems">
     <xi:include href="subsystems/subsystems.rbuild" />
   </directory>
--->
 
 </project>
diff --git a/reactos/lib/lib.rbuild b/reactos/lib/lib.rbuild
index 2db8bf1b2f5..d0ef34d9016 100644
--- a/reactos/lib/lib.rbuild
+++ b/reactos/lib/lib.rbuild
@@ -1,6 +1,60 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <group>
+<directory name="crt">
+	<xi:include href="crt/crt.xml" />
+</directory>
+<directory name="dxguid">
+	<xi:include href="dxguid/dxguid.xml" />
+</directory>
+<directory name="epsapi">
+	<xi:include href="epsapi/epsapi.xml" />
+</directory>
+<directory name="fslib">
+	<xi:include href="fslib/directory.xml" />
+</directory>
+<directory name="inflib">
+	<xi:include href="inflib/inflib.xml" />
+</directory>
+<directory name="intrlck">
+	<xi:include href="intrlck/intrlck.xml" />
+</directory>
+<directory name="kjs">
+	<xi:include href="kjs/kjs.xml" />
+</directory>
+<directory name="libwine">
+	<xi:include href="libwine/libwine.xml" />
+</directory>
+<directory name="nt">
+	<xi:include href="nt/nt.xml" />
+</directory>
+<directory name="pseh">
+	<xi:include href="pseh/pseh.xml" />
+</directory>
+<directory name="rtl">
+	<xi:include href="rtl/rtl.xml" />
+</directory>
+<directory name="smdll">
+	<xi:include href="smdll/smdll.xml" />
+</directory>
+<directory name="smlib">
+	<xi:include href="smlib/smlib.xml" />
+</directory>
+<directory name="string">
+	<xi:include href="string/string.xml" />
+</directory>
+<directory name="strmiids">
+	<xi:include href="strmiids/strmiids.xml" />
+</directory>
+<directory name="uuid">
+	<xi:include href="uuid/uuid.xml" />
+</directory>
+<directory name="wdmguid">
+	<xi:include href="wdmguid/wdmguid.xml" />
+</directory>
+</group>
+
+<!-- The following entires got moved:
 <directory name="acledit">
 	<xi:include href="acledit/acledit.xml" />
 </directory>
@@ -40,9 +94,6 @@
 <directory name="cpl">
 	<xi:include href="cpl/directory.xml" />
 </directory>
-<directory name="crt">
-	<xi:include href="crt/crt.xml" />
-</directory>
 <directory name="crtdll">
 	<xi:include href="crtdll/crtdll.xml" />
 </directory>
@@ -88,12 +139,6 @@
 <directory name="dxdiagn">
 	<xi:include href="dxdiagn/dxdiagn.xml" />
 </directory>
-<directory name="dxguid">
-	<xi:include href="dxguid/dxguid.xml" />
-</directory>
-<directory name="epsapi">
-	<xi:include href="epsapi/epsapi.xml" />
-</directory>
 <directory name="expat">
 	<xi:include href="expat/expat.xml" />
 </directory>
@@ -103,9 +148,6 @@
 <directory name="freetype">
 	<xi:include href="freetype/freetype.xml" />
 </directory>
-<directory name="fslib">
-	<xi:include href="fslib/directory.xml" />
-</directory>
 <directory name="gdi32">
 	<xi:include href="gdi32/gdi32.xml" />
 </directory>
@@ -127,12 +169,6 @@
 <directory name="imm32">
 	<xi:include href="imm32/imm32.xml" />
 </directory>
-<directory name="inflib">
-	<xi:include href="inflib/inflib.xml" />
-</directory>
-<directory name="intrlck">
-	<xi:include href="intrlck/intrlck.xml" />
-</directory>
 <directory name="iphlpapi">
 	<xi:include href="iphlpapi/iphlpapi.xml" />
 </directory>
@@ -142,12 +178,6 @@
 <directory name="kernel32">
 	<xi:include href="kernel32/kernel32.xml" />
 </directory>
-<directory name="kjs">
-	<xi:include href="kjs/kjs.xml" />
-</directory>
-<directory name="libwine">
-	<xi:include href="libwine/libwine.xml" />
-</directory>
 <directory name="lsasrv">
 	<xi:include href="lsasrv/lsasrv.xml" />
 </directory>
@@ -202,9 +232,6 @@
 <directory name="newdev">
 	<xi:include href="newdev/newdev.xml" />
 </directory>
-<directory name="nt">
-	<xi:include href="nt/nt.xml" />
-</directory>
 <directory name="ntdll">
 	<xi:include href="ntdll/ntdll.xml" />
 </directory>
@@ -235,9 +262,6 @@
 <directory name="psapi">
 	<xi:include href="psapi/psapi.xml" />
 </directory>
-<directory name="pseh">
-	<xi:include href="pseh/pseh.xml" />
-</directory>
 <directory name="richedit">
 	<xi:include href="richedit/riched32.xml" />
 </directory>
@@ -250,9 +274,6 @@
 <directory name="rpcrt4">
 	<xi:include href="rpcrt4/rpcrt4.xml" />
 </directory>
-<directory name="rtl">
-	<xi:include href="rtl/rtl.xml" />
-</directory>
 <directory name="samlib">
 	<xi:include href="samlib/samlib.xml" />
 </directory>
@@ -289,18 +310,6 @@
 <directory name="snmpapi">
 	<xi:include href="snmpapi/snmpapi.xml" />
 </directory>
-<directory name="smdll">
-	<xi:include href="smdll/smdll.xml" />
-</directory>
-<directory name="smlib">
-	<xi:include href="smlib/smlib.xml" />
-</directory>
-<directory name="string">
-	<xi:include href="string/string.xml" />
-</directory>
-<directory name="strmiids">
-	<xi:include href="strmiids/strmiids.xml" />
-</directory>
 <directory name="syssetup">
 	<xi:include href="syssetup/syssetup.xml" />
 </directory>
@@ -316,9 +325,6 @@
 <directory name="userenv">
 	<xi:include href="userenv/userenv.xml" />
 </directory>
-<directory name="uuid">
-	<xi:include href="uuid/uuid.xml" />
-</directory>
 <directory name="uxtheme">
 	<xi:include href="uxtheme/uxtheme.xml" />
 </directory>
@@ -328,9 +334,6 @@
 <directory name="version">
 	<xi:include href="version/version.xml" />
 </directory>
-<directory name="wdmguid">
-	<xi:include href="wdmguid/wdmguid.xml" />
-</directory>
 <directory name="wininet">
 	<xi:include href="wininet/wininet.xml" />
 </directory>
@@ -358,4 +361,4 @@
 <directory name="zlib">
 	<xi:include href="zlib/zlib.xml" />
 </directory>
-</group>
+-->
diff --git a/reactos/subsys/subsys.rbuild b/reactos/subsys/subsys.rbuild
index eee2e6a5734..9dcb86926cd 100644
--- a/reactos/subsys/subsys.rbuild
+++ b/reactos/subsys/subsys.rbuild
@@ -1,19 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <group>
-<directory name="csrss">
-	<xi:include href="csrss/csrss.xml" />
-</directory>
-<directory name="ntvdm">
-	<xi:include href="ntvdm/ntvdm.xml" />
-</directory>
 <directory name="smss">
 	<xi:include href="smss/smss.xml" />
 </directory>
 <directory name="system">
 	<xi:include href="system/directory.xml" />
 </directory>
-<directory name="win32k">
-	<xi:include href="win32k/win32k.xml" />
-</directory>
 </group>
diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml
index b8c8b107f4f..a21fafb9092 100644
--- a/reactos/subsys/system/directory.xml
+++ b/reactos/subsys/system/directory.xml
@@ -1,10 +1,41 @@
 <group>
-<directory name="autochk">
-	<xi:include href="autochk/autochk.xml" />
-</directory>
 <directory name="cacls">
 	<xi:include href="cacls/cacls.xml" />
 </directory>
+<directory name="gettype">
+	<xi:include href="gettype/gettype.xml" />
+</directory>
+<directory name="msiexec">
+	<xi:include href="msiexec/msiexec.xml" />
+</directory>
+<directory name="reactos">
+	<xi:include href="reactos/reactos.xml" />
+</directory>
+<directory name="reporterror">
+	<xi:include href="reporterror/reporterror.xml" />
+</directory>
+<directory name="sm">
+	<xi:include href="sm/sm.xml" />
+</directory>
+<directory name="sndvol32">
+	<xi:include href="sndvol32/sndvol32.xml" />
+</directory>
+<directory name="usetup">
+	<xi:include href="usetup/usetup.xml" />
+</directory>
+<directory name="vmwinst">
+	<xi:include href="vmwinst/vmwinst.xml" />
+</directory>
+<directory name="winver">
+	<xi:include href="winver/winver.xml" />
+</directory>
+</group>
+
+<!-- The following needs to be moved:
+
+<directory name="autochk">
+	<xi:include href="autochk/autochk.xml" />
+</directory>
 <directory name="calc">
 	<xi:include href="calc/calc.xml" />
 </directory>
@@ -20,9 +51,6 @@
 <directory name="explorer">
 	<xi:include href="explorer/explorer.xml" />
 </directory>
-<directory name="gettype">
-	<xi:include href="gettype/gettype.xml" />
-</directory>
 <directory name="hostname">
 	<xi:include href="hostname/hostname.xml" />
 </directory>
@@ -38,24 +66,15 @@
 <directory name="msconfig">
 	<xi:include href="msconfig/msconfig.xml" />
 </directory>
-<directory name="msiexec">
-	<xi:include href="msiexec/msiexec.xml" />
-</directory>
 <directory name="notepad">
 	<xi:include href="notepad/notepad.xml" />
 </directory>
-<directory name="reactos">
-	<xi:include href="reactos/reactos.xml" />
-</directory>
 <directory name="regedit">
 	<xi:include href="regedit/regedit.xml" />
 </directory>
 <directory name="regsvr32">
 	<xi:include href="regsvr32/regsvr32.xml" />
 </directory>
-<directory name="reporterror">
-	<xi:include href="reporterror/reporterror.xml" />
-</directory>
 <directory name="rundll32">
 	<xi:include href="rundll32/rundll32.xml" />
 </directory>
@@ -71,34 +90,19 @@
 <directory name="setup">
 	<xi:include href="setup/setup.xml" />
 </directory>
-<directory name="sm">
-	<xi:include href="sm/sm.xml" />
-</directory>
-<directory name="sndvol32">
-	<xi:include href="sndvol32/sndvol32.xml" />
-</directory>
 <directory name="taskmgr">
 	<xi:include href="taskmgr/taskmgr.xml" />
 </directory>
 <directory name="userinit">
 	<xi:include href="userinit/userinit.xml" />
 </directory>
-<directory name="usetup">
-	<xi:include href="usetup/usetup.xml" />
-</directory>
-<directory name="vmwinst">
-	<xi:include href="vmwinst/vmwinst.xml" />
-</directory>
 <directory name="winefile">
 	<xi:include href="winefile/winefile.xml" />
 </directory>
 <directory name="winlogon">
 	<xi:include href="winlogon/winlogon.xml" />
 </directory>
-<directory name="winver">
-	<xi:include href="winver/winver.xml" />
-</directory>
 <directory name="welcome">
 	<xi:include href="welcome/welcome.xml" />
 </directory>
-</group>
+-->
\ No newline at end of file
diff --git a/reactos/subsystems/subsystems.rbuild b/reactos/subsystems/subsystems.rbuild
new file mode 100644
index 00000000000..75d2fb36936
--- /dev/null
+++ b/reactos/subsystems/subsystems.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<group>
+<directory name="ntvdm">
+	<xi:include href="ntvdm/ntvdm.xml" />
+</directory>
+<directory name="win32">
+	<xi:include href="win32/win32.rbuild" />
+</directory>
+</group>
diff --git a/reactos/subsystems/win32/csrss/csrss.xml b/reactos/subsystems/win32/csrss/csrss.rbuild
similarity index 100%
rename from reactos/subsystems/win32/csrss/csrss.xml
rename to reactos/subsystems/win32/csrss/csrss.rbuild
diff --git a/reactos/subsystems/win32/win32.rbuild b/reactos/subsystems/win32/win32.rbuild
new file mode 100644
index 00000000000..cde93f78e98
--- /dev/null
+++ b/reactos/subsystems/win32/win32.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<group>
+<directory name="csrss">
+	<xi:include href="csrss/csrss.rbuild" />
+</directory>
+<directory name="win32k">
+	<xi:include href="win32k/win32k.rbuild" />
+</directory>
+</group>
diff --git a/reactos/subsystems/win32/win32k/win32k.xml b/reactos/subsystems/win32/win32k/win32k.rbuild
similarity index 100%
rename from reactos/subsystems/win32/win32k/win32k.xml
rename to reactos/subsystems/win32/win32k/win32k.rbuild
diff --git a/reactos/tools/gendib/gendib.mak b/reactos/tools/gendib/gendib.mak
index 8eb27607960..697d8ba2821 100644
--- a/reactos/tools/gendib/gendib.mak
+++ b/reactos/tools/gendib/gendib.mak
@@ -41,7 +41,7 @@ gendib_clean:
 	-@$(rm) $(GENDIB_TARGET) $(GENDIB_OBJECTS) 2>$(NUL)
 clean: gendib_clean
 
-GENDIB_DIB_DIR = subsys$(SEP)win32k$(SEP)dib
+GENDIB_DIB_DIR = subsystems$(SEP)win32$(SEP)win32k$(SEP)dib
 
 GENDIB_DIB_FILES = \
 	$(GENDIB_DIB_DIR)$(SEP)dib32gen.c \
diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak
index cc9db8a83a4..f98e801a519 100644
--- a/reactos/tools/nci/nci.mak
+++ b/reactos/tools/nci/nci.mak
@@ -43,7 +43,7 @@ clean: nci_clean
 
 # WIN32K.SYS
 WIN32K_SVC_DB = $(NCI_BASE_)w32ksvc.db
-WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)include$(SEP)napi.h
+WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h
 WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)win32k.S
 WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)win32k.S