Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 17:31:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't rebuild the module if a library is changed. Relinking the module is enough.

Browse source 
svn path=/trunk/; revision=16520
This commit is contained in:
Casper Hornstrup 2005-07-09 07:50:48 +00:00
parent 5dd6792d1d
commit 6c73106dfd
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -874,7 +874,9 @@ MingwModuleHandler::GenerateGccCommand (
dependencies += " " + GetPrecompiledHeaderFilename (); dependencies += " " + GetPrecompiledHeaderFilename ();
/* WIDL generated headers may be used */ /* WIDL generated headers may be used */
dependencies += " " + GetLinkingDependenciesMacro (); vector<string> rpcDependencies;
GetRpcHeaderDependencies ( rpcDependencies );
dependencies += " " + v2s ( rpcDependencies, 5 );
dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
string objectFilename = GetObjectFilename ( string objectFilename = GetObjectFilename (
@ -1598,7 +1600,7 @@ MingwModuleHandler::GenerateTargetMacro ()
void void
MingwModuleHandler::GetRpcHeaderDependencies ( MingwModuleHandler::GetRpcHeaderDependencies (
string_list& dependencies ) const vector<string>& dependencies ) const
{ {
for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ )
{ {
@ -1640,7 +1642,7 @@ MingwModuleHandler::GenerateOtherMacros ()
module.non_if_data, module.non_if_data,
&module.linkerFlags ); &module.linkerFlags );
string_list s; vector<string> s;
if ( module.importLibrary ) if ( module.importLibrary )
{ {
const vector<File*>& files = module.non_if_data.files; const vector<File*>& files = module.non_if_data.files;
@ -1652,7 +1654,6 @@ MingwModuleHandler::GenerateOtherMacros ()
GetSpecObjectDependencies ( s, file.name ); GetSpecObjectDependencies ( s, file.name );
} }
} }
GetRpcHeaderDependencies ( s );
if ( s.size () > 0 ) if ( s.size () > 0 )
{ {
fprintf ( fprintf (

2
reactos/tools/rbuild/backend/mingw/modulehandler.h
View file

@ -179,7 +179,7 @@ private:
void GenerateBuildMapCode (); void GenerateBuildMapCode ();
void GenerateBuildNonSymbolStrippedCode (); void GenerateBuildNonSymbolStrippedCode ();
void CleanupFileVector ( std::vector<File*>& sourceFiles ); 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 GetRpcServerHeaderFilename ( std::string basename ) const;
std::string GetRpcClientHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const;
public: public: