Fix some build files

svn path=/trunk/; revision=21073
This commit is contained in:
Maarten Bosma
2006-02-17 13:44:13 +00:00
parent 8ba858d966
commit daf565ab21
10 changed files with 112 additions and 96 deletions
-2
View File
@@ -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>
+55 -52
View File
@@ -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>
-->
-9
View File
@@ -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>
+35 -31
View File
@@ -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>
-->
+10
View File
@@ -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>
+10
View File
@@ -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>
+1 -1
View File
@@ -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 \
+1 -1
View File
@@ -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