i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ObjectDefines is safe to be called on one file at ones only. So is

Browse Source 
ObjectHdrs.
* Introduced a rule ObjectsDefines which is safe to be invoke with more
  than one file and replaced ObjectDefines where it was used wrongly.
* Fixed SourceHdrs which used ObjectHdrs wrongly.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4626 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-09-11 20:48:05 +00:00
parent e9230d05d0
commit 728b5725a8
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+19 -6
View File
@@ -603,10 +603,10 @@ rule TestObjects
# set headers/defines # set headers/defines
UseCppUnitObjectHeaders $(sources) : $(objects) ; UseCppUnitObjectHeaders $(sources) : $(objects) ;
if $(r5) { if $(r5) {
ObjectDefines $(objects) : TEST_R5 ; ObjectsDefines $(objects) : TEST_R5 ;
} else { } else {
UsePublicObjectHeaders $(sources) : $(headerDirs) : $(objects) ; UsePublicObjectHeaders $(sources) : $(headerDirs) : $(objects) ;
ObjectDefines $(objects) : TEST_OBOS ; ObjectsDefines $(objects) : TEST_OBOS ;
} }
if ! $(NO_TEST_DEBUG) { if ! $(NO_TEST_DEBUG) {
@@ -657,8 +657,7 @@ rule SimpleTest
MakeLocate $(target) : [ FDirName $(OBOS_TEST_DIR) $(relPath) ] ; MakeLocate $(target) : [ FDirName $(OBOS_TEST_DIR) $(relPath) ] ;
Depends obostests : $(target) ; Depends obostests : $(target) ;
LinkSharedOSLibs $(target) : $(libraries) ; LinkSharedOSLibs $(target) : $(libraries) ;
ObjectDefines $(sources) : TEST_OBOS ; ObjectsDefines $(sources) : TEST_OBOS ;
if ! $(NO_TEST_DEBUG) { if ! $(NO_TEST_DEBUG) {
# Turn debugging on. That is usually desired for test code. # Turn debugging on. That is usually desired for test code.
ObjectCcFlags $(sources) : "-g" ; ObjectCcFlags $(sources) : "-g" ;
@@ -919,6 +918,15 @@ actions ResComp1
$(2[1]) -o $(1) $(2[2-]) $(2[1]) -o $(1) $(2[2-])
} }
rule ObjectsDefines
{
# Like ObjectDefines, but allows multiple files to be supplied
local file ;
for file in $(1) {
ObjectDefines $(file) : $(2) ;
}
}
rule SourceHdrs rule SourceHdrs
{ {
# SourceHdrs <sources> : <headers> [ : <gristed objects> ] ; # SourceHdrs <sources> : <headers> [ : <gristed objects> ] ;
@@ -931,10 +939,15 @@ rule SourceHdrs
local headers = $(2) ; local headers = $(2) ;
local objects = $(3) ; local objects = $(3) ;
local file ;
if $(objects) { if $(objects) {
ObjectHdrs $(objects) : $(headers) ; for file in $(objects) {
ObjectHdrs $(file) : $(headers) ;
}
} else { } else {
ObjectHdrs $(sources) : $(headers) ; for file in $(sources) {
ObjectHdrs $(file) : $(headers) ;
}
} }
# Also add the header search dirs to HDRSEARCH. Note, that these dirs # Also add the header search dirs to HDRSEARCH. Note, that these dirs