From 6c73106dfd1bf005dbe490a2f08890e22f24d247 Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Sat, 9 Jul 2005 07:50:48 +0000
Subject: [PATCH] Don't rebuild the module if a library is changed. Relinking
 the module is enough.

svn path=/trunk/; revision=16520
---
 reactos/tools/rbuild/backend/mingw/modulehandler.cpp | 9 +++++----
 reactos/tools/rbuild/backend/mingw/modulehandler.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index a5be8ccca9e..bc83a0c504d 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -874,7 +874,9 @@ MingwModuleHandler::GenerateGccCommand (
 		dependencies += " " + GetPrecompiledHeaderFilename ();
 	
 	/* WIDL generated headers may be used */
-	dependencies += " " + GetLinkingDependenciesMacro ();
+	vector<string> rpcDependencies;
+	GetRpcHeaderDependencies ( rpcDependencies );
+	dependencies += " " + v2s ( rpcDependencies, 5 );
 	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
 
 	string objectFilename = GetObjectFilename (
@@ -1598,7 +1600,7 @@ MingwModuleHandler::GenerateTargetMacro ()
 
 void
 MingwModuleHandler::GetRpcHeaderDependencies (
-	string_list& dependencies ) const
+	vector<string>& dependencies ) const
 {
 	for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ )
 	{
@@ -1640,7 +1642,7 @@ MingwModuleHandler::GenerateOtherMacros ()
 		module.non_if_data,
 		&module.linkerFlags );
 
-	string_list s;
+	vector<string> s;
 	if ( module.importLibrary )
 	{
 		const vector<File*>& files = module.non_if_data.files;
@@ -1652,7 +1654,6 @@ MingwModuleHandler::GenerateOtherMacros ()
 				GetSpecObjectDependencies ( s, file.name );
 		}
 	}
-	GetRpcHeaderDependencies ( s );
 	if ( s.size () > 0 )
 	{
 		fprintf (
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index c51761ae658..644d7a24cb8 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -179,7 +179,7 @@ private:
 	void GenerateBuildMapCode ();
 	void GenerateBuildNonSymbolStrippedCode ();
 	void CleanupFileVector ( std::vector<File*>& sourceFiles );
-	void GetRpcHeaderDependencies ( string_list& dependencies ) const;
+	void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const;
 	std::string GetRpcServerHeaderFilename ( std::string basename ) const;
 	std::string GetRpcClientHeaderFilename ( std::string basename ) const;
 public: