[HAL]: Fucken' A, I knew I'd forget one.

svn path=/trunk/; revision=46650

diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index dccd161..166bb93 100644 (file)
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -1,65 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>

-       <module name="hal_generic_legacy" type="objectlibrary">
+       <module name="hal_generic" type="objectlibrary">

                <include>include</include>
                <include base="ntoskrnl">include</include>
                <define name="_NTHALDLL_" />
                <define name="_NTHAL_" />
                <directory name="generic">
                <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 name="bus">
-                               <file>bushndlr.c</file>
-                               <file>isabus.c</file>
-                               <file>halbus.c</file>
-                               <file>pcibus.c</file>
-                               <file>pcidata.c</file>
-                               <file>sysbus.c</file>
-                       </directory>
-                       <file>beep.c</file>
-                       <file>bios.c</file>
-                       <file>cmos.c</file>
-                       <file>display.c</file>
-                       <file>dma.c</file>
-                       <file>drive.c</file>
-                       <file>halinit.c</file>
-                       <file>misc.c</file>
-                       <file>profil.c</file>
-                       <file>reboot.c</file>
-                       <file>sysinfo.c</file>
-                       <file>timer.c</file>
-                       <file>usage.c</file>
-                       <if property="ARCH" value="i386">
-                               <directory name="i386">
-                                       <file>portio.c</file>
-                                       <file>systimer.S</file>
-                                       <file>trap.S</file>
-                               </directory>
-                       </if>
-                       <if property="ARCH" value="amd64">
-                               <directory name="amd64">
-                                       <file>x86bios.c</file>
-                                       <file>systimer.S</file>
-                               </directory>
-                       </if>
-               </directory>
-               <directory name="include">
-                       <pch>hal.h</pch>
-               </directory>
-       </module>
-       
-       <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 name="bus">
                                <file>bushndlr.c</file>
                                <file>isabus.c</file>
                        <directory name="bus">
                                <file>bushndlr.c</file>
                                <file>isabus.c</file>