Author: hpoussin
Date: Sat Dec 15 15:27:30 2007
New Revision: 31241
URL:
http://svn.reactos.org/svn/reactos?rev=31241&view=rev
Log:
Fix {module}_clean target
Modified:
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Dec 15 15:27:30 2007
@@ -573,6 +573,21 @@
fprintf ( fMakefile, " %s", clean_files[i].c_str() );
}
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() );
}
@@ -2206,19 +2221,6 @@
string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}"
);
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 );
//CLEAN_FILE ( targetMacro );
CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) );