reorder GenerateRules() to get rid of unnecessary if()
authorRoyce Mitchell III <royce3@ev1.net>
Fri, 25 Mar 2005 17:08:30 +0000 (17:08 +0000)
committerRoyce Mitchell III <royce3@ev1.net>
Fri, 25 Mar 2005 17:08:30 +0000 (17:08 +0000)
svn path=/branches/xmlbuildsystem/; revision=14315

reactos/tools/rbuild/backend/mingw/modulehandler.cpp

index 3954f6f..d2012f4 100644 (file)
@@ -1281,23 +1281,20 @@ MingwModuleHandler::GenerateRules ()
                module.name.c_str (),\r
                GetTargetMacro ( module ).c_str () );\r
 \r
                module.name.c_str (),\r
                GetTargetMacro ( module ).c_str () );\r
 \r
-       string ar_target;\r
-       if ( module.type != ObjectLibrary )\r
-               ar_target = GenerateArchiveTarget ( ar, objectsMacro );\r
-\r
-       GenerateObjectFileTargets ( cc,\r
-                                                               cppc,\r
-                                                               cflagsMacro,\r
-                                                               nasmflagsMacro,\r
-                                                               windresflagsMacro );\r
-\r
        if ( module.type != ObjectLibrary )\r
        {\r
        if ( module.type != ObjectLibrary )\r
        {\r
+               string ar_target ( GenerateArchiveTarget ( ar, objectsMacro ) );\r
                if ( targetMacro != ar_target )\r
                {\r
                        CLEAN_FILE ( ar_target );\r
                }\r
        }\r
                if ( targetMacro != ar_target )\r
                {\r
                        CLEAN_FILE ( ar_target );\r
                }\r
        }\r
+\r
+       GenerateObjectFileTargets ( cc,\r
+                                                               cppc,\r
+                                                               cflagsMacro,\r
+                                                               nasmflagsMacro,\r
+                                                               windresflagsMacro );\r
 }\r
 \r
 void\r
 }\r
 \r
 void\r