[HAL]: Smarter .rbuild separation so that ACPI and PC/AT hal don't rebuild the generi...
authorSir Richard <sir_richard@svn.reactos.org>
Thu, 1 Apr 2010 20:41:04 +0000 (20:41 +0000)
committerSir Richard <sir_richard@svn.reactos.org>
Thu, 1 Apr 2010 20:41:04 +0000 (20:41 +0000)
svn path=/trunk/; revision=46649

reactos/hal/halx86/directory.rbuild
reactos/hal/halx86/hal.rbuild
reactos/hal/halx86/hal_generic_acpi.rbuild [new file with mode: 0644]
reactos/hal/halx86/hal_generic_pcat.rbuild [new file with mode: 0644]
reactos/hal/halx86/halacpi.rbuild
reactos/hal/halx86/halamd64.rbuild
reactos/hal/halx86/halmps.rbuild
reactos/hal/halx86/halxbox.rbuild

index abedef8..7cea4c0 100644 (file)
@@ -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" />
index b551cc3..17ffea9 100644 (file)
@@ -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 (file)
index 0000000..3784394
--- /dev/null
@@ -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 (file)
index 0000000..e00ed5b
--- /dev/null
@@ -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>
index 7d22a84..d380cf6 100644 (file)
@@ -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>
index 6b52fde..0b60f76 100644 (file)
@@ -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>
index 2570cb8..d76c49f 100644 (file)
@@ -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>
index 54423ab..ad13545 100644 (file)
@@ -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>