Now MergeObjectFromObjects adds grist to the to be merged objects.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1992 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-18 01:21:30 +00:00
parent c113e0ecfd
commit 54b7cbe14d
1 changed files with 2 additions and 2 deletions
@@ -633,12 +633,12 @@ rule MergeObjectFromObjects
 {
 	# MergeObjectFromObjects <name> : <objects> ;
 	MakeLocate $(1) : $(LOCATE_TARGET) ;
-	MakeLocateObjects $(2) ;
 	Depends $(<) : $(>) ;
 	LINK on $(1) = ld ;
+	MergeObjectFromObjects1 $(1) : [ FGristFiles $(2) ] ;
 }

-actions MergeObjectFromObjects
+actions MergeObjectFromObjects1
 {
 	$(LINK) -r $(2) -o $(1) ;
 }