mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-03 04:13:31 +00:00
Remove $(INIT) variable, which was containing all host tools
Now, each rule depends only of required tools See issue #3131 for more details. svn path=/trunk/; revision=32709
This commit is contained in:
@@ -270,7 +270,6 @@ MingwBackend::ProcessModules ()
|
||||
fprintf ( fMakefile, "\n" );
|
||||
|
||||
GenerateAllTarget ( v );
|
||||
GenerateInitTarget ();
|
||||
GenerateRegTestsRunTarget ();
|
||||
|
||||
for ( i = 0; i < iend; i++ )
|
||||
@@ -576,34 +575,6 @@ MingwBackend::GenerateAllTarget ( const vector<MingwModuleHandler*>& handlers )
|
||||
fprintf ( fMakefile, "\n\t\n\n" );
|
||||
}
|
||||
|
||||
string
|
||||
MingwBackend::GetBuildToolDependencies () const
|
||||
{
|
||||
string dependencies;
|
||||
for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
|
||||
{
|
||||
Module& module = *ProjectNode.modules[i];
|
||||
if ( !module.enabled )
|
||||
continue;
|
||||
if ( module.type == BuildTool )
|
||||
{
|
||||
if ( dependencies.length () > 0 )
|
||||
dependencies += " ";
|
||||
dependencies += GetFullName ( *module.dependency );
|
||||
}
|
||||
}
|
||||
return dependencies;
|
||||
}
|
||||
|
||||
void
|
||||
MingwBackend::GenerateInitTarget () const
|
||||
{
|
||||
fprintf ( fMakefile,
|
||||
"INIT = %s\n",
|
||||
GetBuildToolDependencies ().c_str () );
|
||||
fprintf ( fMakefile, "\n" );
|
||||
}
|
||||
|
||||
void
|
||||
MingwBackend::GenerateRegTestsRunTarget () const
|
||||
{
|
||||
|
||||
@@ -75,8 +75,6 @@ private:
|
||||
void GenerateGlobalVariables () const;
|
||||
bool IncludeInAllTarget ( const Module& module ) const;
|
||||
void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers ) const;
|
||||
std::string GetBuildToolDependencies () const;
|
||||
void GenerateInitTarget () const;
|
||||
void GenerateRegTestsRunTarget () const;
|
||||
void GenerateXmlBuildFilesMacro() const;
|
||||
void GenerateTestSupportCode ();
|
||||
|
||||
@@ -2296,7 +2296,7 @@ MingwModuleHandler::GetDefaultDependencies (
|
||||
return;
|
||||
|
||||
if ( module.name != "psdk" )
|
||||
dependencies.push_back ( "$(INIT) $(PSDK_TARGET) $(psdk_HEADERS)" );
|
||||
dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" );
|
||||
|
||||
/* Check if any dependent library relies on the generated headers */
|
||||
for ( size_t i = 0; i < module.project.modules.size (); i++ )
|
||||
|
||||
Reference in New Issue
Block a user