From d927b8d8fec242b4aec3b082505956cfba4bcc8f Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Wed, 11 May 2005 20:58:40 +0000
Subject: [PATCH] Generate static libraries in intermediate directory

svn path=/branches/xmlbuildsystem/; revision=15232
---
 .../tools/rbuild/backend/mingw/modulehandler.cpp    | 13 +++++++++++--
 reactos/tools/rbuild/backend/mingw/modulehandler.h  |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 12257cc7e31..14843b7e664 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -113,6 +113,15 @@ MingwModuleHandler::PassThruCacheDirectory (
 		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 @@ MingwModuleHandler::GetTargetFilename (
 {
 	string target = PassThruCacheDirectory (
 		NormalizeFilename ( module.GetPath () ),
-		backend->outputDirectory );
+		backend->intermediateDirectory );
 	if ( pclean_files )
 	{
 		string_list& clean_files = *pclean_files;
@@ -136,7 +145,7 @@ MingwModuleHandler::GetImportLibraryFilename (
 {
 	string target = PassThruCacheDirectory (
 		NormalizeFilename ( module.GetDependencyPath () ),
-		backend->outputDirectory );
+		backend->intermediateDirectory );
 	if ( pclean_files )
 	{
 		string_list& clean_files = *pclean_files;
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index 12630e90410..e4df0d2b967 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -28,6 +28,9 @@ public:
 		const std::string &f,
 		Directory* directoryTree );
 
+	static Directory* GetTargetDirectoryTree (
+		const Module& module );
+
 	static std::string GetTargetFilename (
 		const Module& module,
 		string_list* pclean_files );