From f18b0dff8b0bae32d21a314bd4ddcc7f391daafd Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 17 Jun 2007 15:14:46 +0000
Subject: [PATCH] * Use named parameters. * Use Object{Cc,C++}Flags instead of
 setting {CC,C++}FLAGS on the   objects directly.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21438 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/MainBuildRules | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 6a16ae79d4..397a4bdc3c 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -497,7 +497,7 @@ rule BuildPlatformMergeObject
 	MergeObject $(target) : $(sources) : $(otherObjects) ;
 }
 
-rule BuildPlatformMergeObjectPIC
+rule BuildPlatformMergeObjectPIC target : sources : otherObjects
 {
 	# BuildPlatformMergeObjectPIC <name> : <sources> : <other objects> ;
 	# Compiles source files and merges the object files to an object file.
@@ -508,13 +508,8 @@ rule BuildPlatformMergeObjectPIC
 	# <other objects>: Object files or static libraries to be merged. No grist
 	#                  will be added.
 	#
-	local target = $(1) ;
-	local sources = $(2) ;
-	local otherObjects = $(3) ;
-
-	local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
-	CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ; 
-	C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ; 
+	ObjectCcFlags $(sources) : $(HOST_PIC_CCFLAGS) ;
+	ObjectC++Flags $(sources) : $(HOST_PIC_C++FLAGS) ;
 
 	BuildPlatformMergeObject $(target) : $(sources) : $(otherObjects) ;
 }