From 7a812470b6c050b7352ef4fe079ceb2f88aecf7a Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Sun, 15 May 2005 13:57:03 +0000
Subject: [PATCH] Re-insert makefile code for non-DLLs which was removed by
 accident

svn path=/branches/xmlbuildsystem/; revision=15310
---
 .../rbuild/backend/mingw/modulehandler.cpp    | 27 ++++++++++---------
 .../rbuild/backend/mingw/modulehandler.h      |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 831b17fe779..36923a97546 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -1261,6 +1261,15 @@ MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const
 	}
 }
 
+void
+MingwModuleHandler::GenerateRunRsymCode () const
+{
+	fprintf ( fMakefile,
+	          "\t$(ECHO_RSYM)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
+}
+
 void
 MingwModuleHandler::GenerateLinkerCommand (
 	const string& dependencies,
@@ -1331,17 +1340,6 @@ MingwModuleHandler::GenerateLinkerCommand (
 		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 @@ MingwModuleHandler::GenerateLinkerCommand (
 		          objectsMacro.c_str (),
 		          libsMacro.c_str (),
 		          GetLinkerMacro ().c_str () );
-
-		GenerateCleanObjectsAsYouGoCode ();
 	}
+
+	GenerateBuildMapCode ();
+	GenerateBuildNonSymbolStrippedCode ();
+	GenerateRunRsymCode ();
+	GenerateCleanObjectsAsYouGoCode ();
 }
 
 void
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index dd7ae5ba1be..02739d11026 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -87,6 +87,7 @@ protected:
 	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,