Don't generate intermediate archives

svn path=/branches/xmlbuildsystem/; revision=13854

diff --git a/reactos/drivers/net/tcpip/tcpip.xml b/reactos/drivers/net/tcpip/tcpip.xml
index 96b675a..75552cf 100644 (file)
--- a/reactos/drivers/net/tcpip/tcpip.xml
+++ b/reactos/drivers/net/tcpip/tcpip.xml
@@ -25,11 +25,6 @@
                <file>irp.c</file>\r
                <file>lock.c</file>\r
                <file>main.c</file>\r
-               <file>mockbuffer.c</file>\r
-               <file>mockbug.c</file>\r
-               <file>mocklock.c</file>\r
-               <file>mockpool.c</file>\r
-               <file>mockwait.c</file>\r
                <file>ninfo.c</file>\r
                <file>pool.c</file>\r
                <file>proto.c</file>\r

diff --git a/reactos/hal/halx86/generic/generic.xml b/reactos/hal/halx86/generic/generic.xml
index 1ec47e5..e71223a 100644 (file)
--- a/reactos/hal/halx86/generic/generic.xml
+++ b/reactos/hal/halx86/generic/generic.xml
@@ -1,31 +1,43 @@
-<module name="hal_generic" type="staticlibrary">\r
+<module name="hal_generic" type="objectlibrary">\r
        <include base="hal_generic">../include</include>\r
        <include base="ntoskrnl">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r
        <define name="__NTHAL__" />\r
-  <file>adapter.c</file>\r
-  <file>beep.c</file>\r
-  <file>bus.c</file>\r
-  <file>display.c</file>\r
-  <file>dma.c</file>\r
-  <file>drive.c</file>\r
-  <file>enum.c</file>\r
-  <file>fmutex.c</file>\r
-  <file>halinit.c</file>\r
-  <file>ipi.c</file>\r
-  <file>irql.c</file>\r
-  <file>isa.c</file>\r
-  <file>kdbg.c</file>\r
-  <file>mca.c</file>\r
-  <file>misc.c</file>\r
-  <file>pci.c</file>\r
-  <file>portio.c</file>\r
-  <file>processor.c</file>\r
-  <file>reboot.c</file>\r
-  <file>resource.c</file>\r
-  <file>spinlock.c</file>\r
-  <file>sysbus.c</file>\r
-  <file>sysinfo.c</file>\r
-  <file>time.c</file>\r
-  <file>timer.c</file>\r
+       <file>adapter.c</file>\r
+       <file>beep.c</file>\r
+       <file>bus.c</file>\r
+       <file>dma.c</file>\r
+       <file>drive.c</file>\r
+       <file>enum.c</file>\r
+       <file>fmutex.c</file>\r
+       <file>halinit.c</file>\r
+       <file>isa.c</file>\r
+       <file>kdbg.c</file>\r
+       <file>mca.c</file>\r
+       <file>misc.c</file>\r
+       <file>pci.c</file>\r
+       <file>portio.c</file>\r
+       <file>reboot.c</file>\r
+       <file>spinlock.c</file>\r
+       <file>sysbus.c</file>\r
+       <file>sysinfo.c</file>\r
+       <file>time.c</file>\r
+       <file>timer.c</file>\r
+</module>\r
+<module name="hal_generic_up" type="objectlibrary">\r
+       <include base="hal_generic_up">../include</include>\r
+       <include base="ntoskrnl">include</include>\r
+       <define name="_DISABLE_TIDENTS" />\r
+       <define name="__NTHAL__" />\r
+       <file>ipi.c</file>\r
+       <file>irql.c</file>\r
+       <file>processor.c</file>\r
+       <file>resource.c</file>\r
+</module>\r
+<module name="hal_generic_pc" type="objectlibrary">\r
+       <include base="hal_generic_pc">../include</include>\r
+       <include base="ntoskrnl">include</include>\r
+       <define name="_DISABLE_TIDENTS" />\r
+       <define name="__NTHAL__" />\r
+       <file>display.c</file>\r
 </module>\r

diff --git a/reactos/hal/halx86/mp/halmp.xml b/reactos/hal/halx86/mp/halmp.xml
index e40f86c..2cbb6cf 100644 (file)
--- a/reactos/hal/halx86/mp/halmp.xml
+++ b/reactos/hal/halx86/mp/halmp.xml
@@ -4,6 +4,9 @@
        <define name="_DISABLE_TIDENTS" />\r
        <define name="CONFIG_SMP" />\r
        <define name="__NTHAL__" />\r
+       <library>hal_generic</library>\r
+       <library>hal_generic_pc</library>\r
+       <library>ntoskrnl</library>\r
        <file>apic.c</file>\r
        <file>halinit_mp.c</file>\r
        <file>ipi_mp.c</file>\r

diff --git a/reactos/hal/halx86/up/halup.xml b/reactos/hal/halx86/up/halup.xml
index 97a5b7b..e265049 100644 (file)
--- a/reactos/hal/halx86/up/halup.xml
+++ b/reactos/hal/halx86/up/halup.xml
@@ -4,6 +4,10 @@
        <include base="ntoskrnl">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r
        <define name="__NTHAL__" />\r
+       <library>hal_generic</library>\r
+       <library>hal_generic_up</library>\r
+       <library>hal_generic_pc</library>\r
+       <library>ntoskrnl</library>\r
        <file>halinit_up.c</file>\r
        <file>halup.rc</file>\r
 </module>\r

diff --git a/reactos/hal/halx86/xbox/halxbox.xml b/reactos/hal/halx86/xbox/halxbox.xml
index 8a91cfc..79d2421 100644 (file)
--- a/reactos/hal/halx86/xbox/halxbox.xml
+++ b/reactos/hal/halx86/xbox/halxbox.xml
@@ -4,6 +4,9 @@
        <define name="_DISABLE_TIDENTS" />\r
        <define name="UP" />\r
        <define name="__NTHAL__" />\r
+       <library>hal_generic</library>\r
+       <library>hal_generic_up</library>\r
+       <library>ntoskrnl</library>\r
        <file>display_xbox.c</file>\r
        <file>font.c</file>\r
        <file>halinit_xbox.c</file>\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 5098698..03aa066 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -481,7 +481,7 @@ MingwModuleHandler::GenerateMacros (
 {\r
        size_t i;\r
 \r
-       if ( includes.size() || defines.size() )\r
+       if ( includes.size () > 0 || defines.size () > 0 )\r
        {\r
                GenerateMacro ( assignmentOperation,\r
                                cflags_macro,\r
@@ -509,9 +509,9 @@ MingwModuleHandler::GenerateMacros (
                }\r
        }\r
        \r
-       if ( files.size() )\r
+       if ( files.size () > 0 )\r
        {\r
-               for ( i = 0; i < files.size(); i++ )\r
+               for ( i = 0; i < files.size (); i++ )\r
                {\r
                        if ( files[i]->first )\r
                        {\r
@@ -525,14 +525,11 @@ MingwModuleHandler::GenerateMacros (
                fprintf (\r
                        fMakefile,\r
                        "%s %s",\r
-                       objs_macro.c_str(),\r
+                       objs_macro.c_str (),\r
                        assignmentOperation );\r
                for ( i = 0; i < files.size(); i++ )\r
                {\r
-                       string extension = GetExtension ( files[i]->name );\r
-                       if ( extension != ".spec"\r
-                         && extension != ".SPEC"\r
-                         && !files[i]->first )\r
+                       if ( !files[i]->first )\r
                        {\r
                                fprintf (\r
                                        fMakefile,\r
@@ -1308,7 +1305,7 @@ void
 MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module )\r
 {\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
-       string archiveFilename = GetModuleArchiveFilename ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
 \r
        GenerateMacrosAndTargetsHost ( module );\r
@@ -1321,14 +1318,14 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& modul
        \r
        fprintf ( fMakefile, "%s: %s %s\n",\r
                  target.c_str (),\r
-                 archiveFilename.c_str (),\r
+                 objectsMacro.c_str (),\r
                  importLibraryDependencies.c_str () );\r
        fprintf ( fMakefile,\r
                  "\t%s %s -o %s %s %s\n\n",\r
                  linker.c_str (),\r
                  GetLinkerMacro ( module ).c_str (),\r
                  target.c_str (),\r
-                 archiveFilename.c_str (),\r
+                 objectsMacro.c_str (),\r
                  importLibraryDependencies.c_str () );\r
 }\r
 \r
@@ -1473,7 +1470,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
        string workingDirectory = GetWorkingDirectory ( );\r
-       string archiveFilename = GetModuleArchiveFilename ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
 \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1484,7 +1481,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
 \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         archiveFilename.c_str (),\r
+                         objectsMacro.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",\r
@@ -1493,7 +1490,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       archiveFilename );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1526,8 +1523,8 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
 {\r
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( PassThruCacheDirectory( FixupTargetFilename ( module.GetPath () ) ) );\r
-       string workingDirectory = GetWorkingDirectory ( );\r
-       string archiveFilename = GetModuleArchiveFilename ( module );\r
+       string workingDirectory = GetWorkingDirectory ();\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
 \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1542,7 +1539,7 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
 \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         archiveFilename.c_str (),\r
+                         objectsMacro.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",\r
@@ -1551,7 +1548,7 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       archiveFilename );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1584,8 +1581,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
        string workingDirectory = GetWorkingDirectory ( );\r
-       string objectFilenames = GetObjectFilenames ( module );\r
-       string archiveFilename = GetModuleArchiveFilename ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
        \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1596,7 +1592,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
 \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         archiveFilename.c_str (),\r
+                         objectsMacro.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",\r
@@ -1605,7 +1601,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1638,8 +1634,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
        string workingDirectory = GetWorkingDirectory ( );\r
-       string objectFilenames = GetObjectFilenames ( module );\r
-       string archiveFilename = GetModuleArchiveFilename ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
        \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1654,7 +1649,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
 \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         archiveFilename.c_str (),\r
+                         objectsMacro.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",\r
@@ -1663,7 +1658,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1718,7 +1713,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
        string workingDirectory = GetWorkingDirectory ( );\r
-       string objectFilenames = GetObjectFilenames ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string linkingDependencies = GetLinkingDependencies ( module );\r
 \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1728,7 +1723,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
        \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         objectFilenames.c_str (),\r
+                         objectsMacro.c_str (),\r
                          linkingDependencies.c_str () );\r
 \r
                string linker;\r
@@ -1743,7 +1738,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
                GenerateLinkerCommand ( module,\r
                                        linker,\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1776,7 +1771,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
        string workingDirectory = GetWorkingDirectory ( );\r
-       string objectFilenames = GetObjectFilenames ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
 \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1787,7 +1782,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
 \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         objectFilenames.c_str (),\r
+                         objectsMacro.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
                string linker;\r
@@ -1802,7 +1797,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
                GenerateLinkerCommand ( module,\r
                                        linker,\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1835,7 +1830,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
        static string ros_junk ( "$(ROS_TEMPORARY)" );\r
        string target ( FixupTargetFilename ( module.GetPath () ) );\r
        string workingDirectory = GetWorkingDirectory ( );\r
-       string objectFilenames = GetObjectFilenames ( module );\r
+       string objectsMacro = GetObjectsMacro ( module );\r
        string importLibraryDependencies = GetImportLibraryDependencies ( module );\r
 \r
        GenerateImportLibraryTargetIfNeeded ( module );\r
@@ -1846,7 +1841,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
 \r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          target.c_str (),\r
-                         objectFilenames.c_str (),\r
+                         objectsMacro.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
                string linker;\r
@@ -1861,7 +1856,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
                GenerateLinkerCommand ( module,\r
                                        linker,\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r