Add dependency to the pseudotarget 'obj' to improve MergeObjectFromObjects rule.
Thanks to Ingo for the hint. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13286 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -316,8 +316,8 @@ rule SetupIncludes
|
|||||||
local os_includes = add-ons add-ons/file_system add-ons/graphics
|
local os_includes = add-ons add-ons/file_system add-ons/graphics
|
||||||
add-ons/input_server add-ons/screen_saver
|
add-ons/input_server add-ons/screen_saver
|
||||||
add-ons/tracker app device drivers game interface
|
add-ons/tracker app device drivers game interface
|
||||||
kernel media mail midi midi2 net storage support
|
kernel media mail midi midi2 net opengl storage support
|
||||||
translation opengl ;
|
translation ;
|
||||||
|
|
||||||
# Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times.
|
# Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times.
|
||||||
|
|
||||||
@@ -1036,6 +1036,7 @@ rule MergeObjectFromObjects
|
|||||||
MakeLocate $(1) : $(LOCATE_TARGET) ;
|
MakeLocate $(1) : $(LOCATE_TARGET) ;
|
||||||
Depends $(1) : $(objects) ;
|
Depends $(1) : $(objects) ;
|
||||||
Depends $(1) : $(3) ;
|
Depends $(1) : $(3) ;
|
||||||
|
LocalDepends obj : $(1) ;
|
||||||
LINK on $(1) = ld ;
|
LINK on $(1) = ld ;
|
||||||
MergeObjectFromObjects1 $(1) : $(objects) $(3) ;
|
MergeObjectFromObjects1 $(1) : $(objects) $(3) ;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user