[ros-diffs] [chorns] 15232: Generate static libraries in intermediate directory

Generate static libraries in intermediate directory
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-05-11 20:45:48 UTC (rev 15231)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-05-11 20:58:40 UTC (rev 15232)
@@ -113,6 +113,15 @@

 		return generatedFilesDirectory + SSEP + file;
 }
 
+/*static*/ Directory*
+MingwModuleHandler::GetTargetDirectoryTree (
+	const Module& module )
+{
+	if ( module.type == StaticLibrary )
+		return backend->intermediateDirectory;
+	return backend->outputDirectory;
+}
+
 /*static*/ string
 MingwModuleHandler::GetTargetFilename (
 	const Module& module,
@@ -120,7 +129,7 @@
 {
 	string target = PassThruCacheDirectory (
 		NormalizeFilename ( module.GetPath () ),
-		backend->outputDirectory );
+		backend->intermediateDirectory );
 	if ( pclean_files )
 	{
 		string_list& clean_files = *pclean_files;
@@ -136,7 +145,7 @@
 {
 	string target = PassThruCacheDirectory (
 		NormalizeFilename ( module.GetDependencyPath () ),
-		backend->outputDirectory );
+		backend->intermediateDirectory );
 	if ( pclean_files )
 	{
 		string_list& clean_files = *pclean_files;
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h	2005-05-11 20:45:48 UTC (rev 15231)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h	2005-05-11 20:58:40 UTC (rev 15232)
@@ -28,6 +28,9 @@

 		const std::string &f,
 		Directory* directoryTree );
 
+	static Directory* GetTargetDirectoryTree (
+		const Module& module );
+
 	static std::string GetTargetFilename (
 		const Module& module,
 		string_list* pclean_files );