From 79b498345886b4bb23a4a2af5622d407ae78d999 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 15 Jun 2004 22:13:34 +0000
Subject: [PATCH] Refactored rule SetupObjectsDir. New rule FObjectsDir.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7997 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 Jamrules | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Jamrules b/Jamrules
index 33231f6ca5..ce63030d3e 100644
--- a/Jamrules
+++ b/Jamrules
@@ -1438,14 +1438,19 @@ rule OBOSInstallRelSymLink
 #-------------------------------------------------------------------------------
 # Low-level OBOS utility rules
 #-------------------------------------------------------------------------------
+rule FObjectsDir
+{
+	# FObjectsDir
+	#
+	# Returns the output directory for object files for the current
+	# subdirectory.
+
+	return [ FDirName $(OBOS_OBJECT_TARGET) $(SUBDIR_TOKENS[2-]) ] ;
+}
+
 rule SetupObjectsDir
 {
-	local rel_objectsdir;
-	
-	# Copy subdir tokens except the first, as that will be "sources", and we
-	# do not want to include that :)
-	rel_objectsdir = [ FDirName $(SUBDIR_TOKENS[2-]) ] ;
-	LOCATE_TARGET = [ FDirName $(OBOS_OBJECT_TARGET) $(rel_objectsdir) ] ;
+	LOCATE_TARGET = [ FObjectsDir ] ;
 	LOCATE_SOURCE = $(LOCATE_TARGET) ;
 	SEARCH_SOURCE = [ Filter $(SEARCH_SOURCE) : $(LOCATE_TARGET) ]
 					$(LOCATE_TARGET) ;