[ros-diffs] [chorns] 15310: Re-insert makefile code for non-DLLs which was removed by accident

[chorns at svn.reactos.com]

Re-insert makefile code for non-DLLs which was removed by accident
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-05-15 13:21:54 UTC (rev 15309)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-05-15 13:57:03 UTC (rev 15310)
@@ -1262,6 +1262,15 @@

 }
 
 void
+MingwModuleHandler::GenerateRunRsymCode () const
+{
+	fprintf ( fMakefile,
+	          "\t$(ECHO_RSYM)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
+}
+
+void
 MingwModuleHandler::GenerateLinkerCommand (
 	const string& dependencies,
 	const string& linker,
@@ -1331,17 +1340,6 @@
 		fprintf ( fMakefile,
 		          "\t-@${rm} %s 2>$(NUL)\n",
 		          temp_exp.c_str () );
-		
-		GenerateCleanObjectsAsYouGoCode ();
-	
-		GenerateBuildMapCode ();
-	
-		GenerateBuildNonSymbolStrippedCode ();
-	
-		fprintf ( fMakefile,
-		          "\t$(ECHO_RSYM)\n" );
-		fprintf ( fMakefile,
-		          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
 	}
 	else
 	{
@@ -1353,9 +1351,12 @@
 		          objectsMacro.c_str (),
 		          libsMacro.c_str (),
 		          GetLinkerMacro ().c_str () );
+	}
 
-		GenerateCleanObjectsAsYouGoCode ();
-	}
+	GenerateBuildMapCode ();
+	GenerateBuildNonSymbolStrippedCode ();
+	GenerateRunRsymCode ();
+	GenerateCleanObjectsAsYouGoCode ();
 }
 
 void
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h	2005-05-15 13:21:54 UTC (rev 15309)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h	2005-05-15 13:57:03 UTC (rev 15310)
@@ -87,6 +87,7 @@

 	std::string GetLibsMacro () const;
 	std::string GetLinkerMacro () const;
 	void GenerateCleanObjectsAsYouGoCode () const;
+	void GenerateRunRsymCode () const;
 	void GenerateLinkerCommand ( const std::string& dependencies,
 	                             const std::string& linker,
 	                             const std::string&
linkerParameters,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050515/b102905f/attachment.html