adjust newlines around rsym command

[reactos.git] / reactos / tools / rbuild / backend / mingw / modulehandler.cpp

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 5098698..62f2891 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
@@ -860,7 +857,7 @@ MingwModuleHandler::GenerateLinkerCommand ( const Module& module,
        else\r
        {\r
                fprintf ( fMakefile,\r
-                         "\t%s %s -o %s %s %s %s\n\n",\r
+                         "\t%s %s -o %s %s %s %s\n",\r
                          linker.c_str (),\r
                          linkerParameters.c_str (),\r
                          target.c_str (),\r
@@ -868,6 +865,11 @@ MingwModuleHandler::GenerateLinkerCommand ( const Module& module,
                          importLibraryDependencies.c_str (),\r
                          GetLinkerMacro ( module ).c_str () );\r
        }\r
+\r
+       fprintf ( fMakefile,\r
+                     "\t${rsym} %s %s\n\n",\r
+                     target.c_str (),\r
+                     target.c_str () );\r
 }\r
 \r
 void\r
@@ -1308,7 +1310,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 +1323,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
@@ -1403,8 +1405,12 @@ MingwKernelModuleHandler::GenerateKernelModuleTarget ( const Module& module )
                  objectsMacro.c_str (),\r
                  importLibraryDependencies.c_str () );\r
        fprintf ( fMakefile,\r
-                 "\t${rm} %s\n\n",\r
+                 "\t${rm} %s\n",\r
                  temp_exp.c_str () );\r
+       fprintf ( fMakefile,\r
+                     "\t${rsym} %s %s\n\n",\r
+                     target.c_str (),\r
+                     target.c_str () );\r
 }\r
 \r
 \r
@@ -1473,7 +1479,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 +1490,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 +1499,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       archiveFilename );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1526,8 +1532,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 +1548,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 +1557,7 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       archiveFilename );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1584,8 +1590,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 +1601,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 +1610,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1638,8 +1643,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 +1658,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 +1667,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
                GenerateLinkerCommand ( module,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1718,7 +1722,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 +1732,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 +1747,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
                GenerateLinkerCommand ( module,\r
                                        linker,\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1776,7 +1780,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 +1791,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 +1806,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
                GenerateLinkerCommand ( module,\r
                                        linker,\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r
@@ -1835,7 +1839,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 +1850,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 +1865,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
                GenerateLinkerCommand ( module,\r
                                        linker,\r
                                        linkerParameters,\r
-                                       objectFilenames );\r
+                                       objectsMacro );\r
        }\r
        else\r
        {\r