From 72053cbd18d821a077f350e102c0ba13e83cedb8 Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Thu, 19 May 2005 18:38:04 +0000
Subject: [PATCH] Don't put modules in project root to avoid overwriting the
 top-level makefile with a proxy makefile

svn path=/branches/xmlbuildsystem/; revision=15411
---
 reactos/ReactOS.xml                | 7 -------
 reactos/bootdata/bootcd/bootcd.xml | 2 ++
 reactos/bootdata/bootdata.xml      | 6 ++++++
 reactos/bootdata/livecd/livecd.xml | 2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 reactos/bootdata/bootcd/bootcd.xml
 create mode 100644 reactos/bootdata/livecd/livecd.xml

diff --git a/reactos/ReactOS.xml b/reactos/ReactOS.xml
index 1e8a2b55ce2..36141b9ef62 100644
--- a/reactos/ReactOS.xml
+++ b/reactos/ReactOS.xml
@@ -65,11 +65,4 @@
 	<directory name="subsys">
 		<xi:include href="subsys/directory.xml" />
 	</directory>
-
-	<module name="bootcd" type="iso">
-	</module>
-
-	<module name="livecd" type="liveiso">
-	</module>
-
 </project>
diff --git a/reactos/bootdata/bootcd/bootcd.xml b/reactos/bootdata/bootcd/bootcd.xml
new file mode 100644
index 00000000000..04a20a5c52d
--- /dev/null
+++ b/reactos/bootdata/bootcd/bootcd.xml
@@ -0,0 +1,2 @@
+<module name="bootcd" type="iso">
+</module>
diff --git a/reactos/bootdata/bootdata.xml b/reactos/bootdata/bootdata.xml
index 7eca69a0201..d0da3503186 100644
--- a/reactos/bootdata/bootdata.xml
+++ b/reactos/bootdata/bootdata.xml
@@ -6,3 +6,9 @@
 <cdfile base="reactos">hivesft.inf</cdfile>
 <cdfile base="reactos">hivesys.inf</cdfile>
 <cdfile base="reactos">txtsetup.sif</cdfile>
+<directory name="bootcd">
+	<xi:include href="bootcd/bootcd.xml" />
+</directory>
+<directory name="livecd">
+	<xi:include href="livecd/livecd.xml" />
+</directory>
diff --git a/reactos/bootdata/livecd/livecd.xml b/reactos/bootdata/livecd/livecd.xml
new file mode 100644
index 00000000000..766fa73a1c3
--- /dev/null
+++ b/reactos/bootdata/livecd/livecd.xml
@@ -0,0 +1,2 @@
+<module name="livecd" type="liveiso">
+</module>