From: Sir Richard <sir_richard@svn.reactos.org>
Date: Thu, 1 Apr 2010 20:41:04 +0000 (+0000)
Subject: [HAL]: Smarter .rbuild separation so that ACPI and PC/AT hal don't rebuild the generi... 
X-Git-Tag: backups/header-work@57446~68^2~13
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=dae14f1215b091220a213a6f2951dc2722398ea9

[HAL]: Smarter .rbuild separation so that ACPI and PC/AT hal don't rebuild the generic library twice. Now generic stays generic, and generic_pcat/acpi are add-on libaries just like generic_up and generic_mp.

svn path=/trunk/; revision=46649
---

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index abedef8ea1c..7cea4c006fa 100644
--- a/reactos/hal/halx86/directory.rbuild
+++ b/reactos/hal/halx86/directory.rbuild
@@ -5,7 +5,9 @@
 	<xi:include href="hal_generic.rbuild" />
 	<xi:include href="hal_generic_up.rbuild" />
 	<xi:include href="hal_generic_mp.rbuild" />
-
+	<xi:include href="hal_generic_pcat.rbuild" />
+	<xi:include href="hal_generic_acpi.rbuild" />
+		
 	<if property="ARCH" value="i386">
 		<xi:include href="hal.rbuild" />
     	<xi:include href="halacpi.rbuild" />
diff --git a/reactos/hal/halx86/hal.rbuild b/reactos/hal/halx86/hal.rbuild
index b551cc3308c..17ffea9c4a0 100644
--- a/reactos/hal/halx86/hal.rbuild
+++ b/reactos/hal/halx86/hal.rbuild
@@ -8,7 +8,8 @@
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHALDLL_" />
 		<define name="_NTHAL_" />
-		<library>hal_generic_legacy</library>
+		<library>hal_generic</library>
+		<library>hal_generic_pcat</library>
 		<library>hal_generic_up</library>
 		<library>ntoskrnl</library>
 		<library>libcntpr</library>
diff --git a/reactos/hal/halx86/hal_generic_acpi.rbuild b/reactos/hal/halx86/hal_generic_acpi.rbuild
new file mode 100644
index 00000000000..3784394b642
--- /dev/null
+++ b/reactos/hal/halx86/hal_generic_acpi.rbuild
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group>
+	<module name="hal_generic_acpi" type="objectlibrary">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_NTHALDLL_" />
+		<define name="_NTHAL_" />
+		<directory name="generic">
+    	    <directory name="acpi">
+    	        <file>halacpi.c</file>
+    	        <file>halpnpdd.c</file>
+    	    </directory>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/hal_generic_pcat.rbuild b/reactos/hal/halx86/hal_generic_pcat.rbuild
new file mode 100644
index 00000000000..e00ed5bdb4e
--- /dev/null
+++ b/reactos/hal/halx86/hal_generic_pcat.rbuild
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group>
+	<module name="hal_generic_pcat" type="objectlibrary">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_NTHALDLL_" />
+		<define name="_NTHAL_" />
+		<directory name="generic">
+    		<directory name="legacy">
+    	        <file>halpcat.c</file>
+    	    </directory>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/halacpi.rbuild b/reactos/hal/halx86/halacpi.rbuild
index 7d22a84b79f..d380cf6889e 100644
--- a/reactos/hal/halx86/halacpi.rbuild
+++ b/reactos/hal/halx86/halacpi.rbuild
@@ -8,6 +8,7 @@
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHALDLL_" />
 		<define name="_NTHAL_" />
+		<library>hal_generic</library>
 		<library>hal_generic_acpi</library>
 		<library>hal_generic_up</library>
 		<library>ntoskrnl</library>
diff --git a/reactos/hal/halx86/halamd64.rbuild b/reactos/hal/halx86/halamd64.rbuild
index 6b52fdef9e5..0b60f7615dc 100644
--- a/reactos/hal/halx86/halamd64.rbuild
+++ b/reactos/hal/halx86/halamd64.rbuild
@@ -10,6 +10,7 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_NTHAL_" />
 	<define name="_X86BIOS_" />
+	<library>hal_generic</library>
 	<library>hal_generic_acpi</library>
 	<library>hal_generic_up</library>
 	<library>ntoskrnl</library>
diff --git a/reactos/hal/halx86/halmps.rbuild b/reactos/hal/halx86/halmps.rbuild
index 2570cb84620..d76c49f39da 100644
--- a/reactos/hal/halx86/halmps.rbuild
+++ b/reactos/hal/halx86/halmps.rbuild
@@ -9,7 +9,8 @@
 		<define name="CONFIG_SMP" />
 		<define name="_NTHALDLL_" />
 		<define name="_NTHAL_" />
-		<library>hal_generic_legacy</library>
+		<library>hal_generic</library>
+		<library>hal_generic_pcat</library>
 		<library>hal_generic_mp</library>
 		<library>ntoskrnl</library>
 		<library>libcntpr</library>
diff --git a/reactos/hal/halx86/halxbox.rbuild b/reactos/hal/halx86/halxbox.rbuild
index 54423ab9075..ad13545b405 100644
--- a/reactos/hal/halx86/halxbox.rbuild
+++ b/reactos/hal/halx86/halxbox.rbuild
@@ -8,7 +8,8 @@
 		<define name="_NTHALDLL_" />
 		<define name="_NTHAL_" />
 		<define name="SARCH_XBOX" />
-		<library>hal_generic_legacy</library>
+		<library>hal_generic</library>
+		<library>hal_generic_pcat</library>
 		<library>hal_generic_up</library>
 		<library>ntoskrnl</library>
 		<library>libcntpr</library>