Move some more autogenerated files to intermediate directory

[reactos.git] / reactos / ntoskrnl / ntoskrnl.rbuild

diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild
index ee1c5df..6b41ca5 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl.rbuild
@@ -1,7 +1,6 @@
 <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe">
-    <bootstrap base="reactos" />
+    <bootstrap base="$(CDOUTPUT)" />
     <importlibrary definition="ntoskrnl.def" />
-    <define name="_SEH_NO_NATIVE_NLG" />
     <define name="_DISABLE_TIDENTS" />
     <define name="__NTOSKRNL__" />
     <define name="_NTOSKRNL_" />
@@ -10,8 +9,12 @@
     <define name="__USE_W32API" />
     <define name="WIN9X_COMPAT_SPINLOCK" />
     <define name="_IN_KERNEL_" />
+    <if property="_WINKD_" value="1">
+        <define name="_WINKD_" />
+    </if>
     <include base="cmlib">.</include>
     <include base="ntoskrnl">include</include>
+    <include base="ntoskrnl" root="intermediate"></include>
     <include base="ReactOS">include/reactos/drivers</include>
     <library>csq</library>
     <library>hal</library>
@@ -19,7 +22,7 @@
     <library>cmlib</library>
     <library>rtl</library>
     <library>rossym</library>
-    <library>string</library>
+    <library>libcntpr</library>
     <library>kdcom</library>
     <library>bootvid</library>
     <library>wdmguid</library>
@@ -34,6 +37,7 @@
                 <file>cpu.c</file>
                 <file>ctxswitch.S</file>
                 <file>exp.c</file>
+                <file>init.S</file>
                 <file>irqobj.c</file>
                 <file>kiinit.c</file>
                 <file>ldt.c</file>
@@ -81,19 +85,46 @@
             <file>pin.c</file>
             <file>view.c</file>
     </directory>
+    <directory name="config">
+            <if property="ARCH" value="i386">
+                <directory name="i386">
+                    <file>cmhardwr.c</file>
+                </directory>
+            </if>
+            <file>cmapi.c</file>
+            <file>cmboot.c</file>
+            <file>cmcheck.c</file>
+            <file>cmcontrl.c</file>
+            <file>cmconfig.c</file>
+            <file>cmdata.c</file>
+            <file>cmindex.c</file>
+            <file>cminit.c</file>
+            <file>cmhook.c</file>
+            <file>cmkcbncb.c</file>
+            <file>cmkeydel.c</file>
+            <file>cmmapvw.c</file>
+            <file>cmname.c</file>
+            <file>cmparse.c</file>
+            <file>cmse.c</file>
+            <file>cmsecach.c</file>
+            <file>cmsysini.c</file>
+            <file>cmvalue.c</file>
+            <file>cmvalche.c</file>
+            <file>cmwraprs.c</file>
+    </directory>
     <directory name="cm">
-            <file>import.c</file>
             <file>ntfunc.c</file>
             <file>regfile.c</file>
             <file>registry.c</file>
             <file>regobj.c</file>
-            <file>newcm.c</file>
-            <file>cmdata.c</file>
     </directory>
     <directory name="dbgk">
         <file>dbgkutil.c</file>
         <file>dbgkobj.c</file>
     </directory>
+    <directory name="ex" root="intermediate">
+        <file>zw.S</file>
+    </directory>
     <directory name="ex">
         <if property="ARCH" value="i386">
             <directory name="i386">
@@ -111,6 +142,7 @@
             <file>fmutex.c</file>
             <file>handle.c</file>
             <file>harderr.c</file>
+            <file>hdlsterm.c</file>
             <file>init.c</file>
             <file>keyedevt.c</file>
             <file>locale.c</file>
@@ -128,8 +160,8 @@
             <file>uuid.c</file>
             <file>win32k.c</file>
             <file>work.c</file>
+            <file>xipdisp.c</file>
             <file>zone.c</file>
-        <file>zw.S</file>
     </directory>
     <directory name="fsrtl">
             <file>dbcsname.c</file>