mirror of
https://github.com/reactos/reactos.git
synced 2024-07-31 00:28:56 +00:00
Fix {module}_clean target
svn path=/trunk/; revision=31241
This commit is contained in:
parent
a054098132
commit
a3c09fcea9
|
@ -573,6 +573,21 @@ MingwModuleHandler::GenerateCleanTarget () const
|
||||||
fprintf ( fMakefile, " %s", clean_files[i].c_str() );
|
fprintf ( fMakefile, " %s", clean_files[i].c_str() );
|
||||||
}
|
}
|
||||||
fprintf ( fMakefile, " 2>$(NUL)\n" );
|
fprintf ( fMakefile, " 2>$(NUL)\n" );
|
||||||
|
|
||||||
|
if ( module.name != "zlib" ) /* Avoid make warning */
|
||||||
|
{
|
||||||
|
DirectoryLocation root;
|
||||||
|
if ( backend->configuration.GenerateProxyMakefilesInSourceTree )
|
||||||
|
root = SourceDirectory;
|
||||||
|
else
|
||||||
|
root = OutputDirectory;
|
||||||
|
FileLocation proxyMakefile ( root,
|
||||||
|
module.output->relative_path,
|
||||||
|
"GNUmakefile" );
|
||||||
|
fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n",
|
||||||
|
backend->GetFullName ( proxyMakefile ).c_str () );
|
||||||
|
}
|
||||||
|
|
||||||
fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() );
|
fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2206,19 +2221,6 @@ MingwModuleHandler::GenerateRules ()
|
||||||
string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" );
|
string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" );
|
||||||
string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" );
|
string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" );
|
||||||
|
|
||||||
if ( module.name != "zlib" ) /* Avoid make warning */
|
|
||||||
{
|
|
||||||
DirectoryLocation root;
|
|
||||||
if ( backend->configuration.GenerateProxyMakefilesInSourceTree )
|
|
||||||
root = SourceDirectory;
|
|
||||||
else
|
|
||||||
root = OutputDirectory;
|
|
||||||
FileLocation proxyMakefile ( root,
|
|
||||||
module.output->relative_path,
|
|
||||||
"GNUmakefile" );
|
|
||||||
CLEAN_FILE ( proxyMakefile );
|
|
||||||
}
|
|
||||||
|
|
||||||
string targetMacro = GetTargetMacro ( module );
|
string targetMacro = GetTargetMacro ( module );
|
||||||
//CLEAN_FILE ( targetMacro );
|
//CLEAN_FILE ( targetMacro );
|
||||||
CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) );
|
CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) );
|
||||||
|
|
Loading…
Reference in a new issue