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

Adjusted the Use*Headers rules to reflect the new header dir structure.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@13 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2002-07-09 20:11:42 +00:00
parent 5a2b57c361
commit c633961ad2
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+18 -6
View File
@@ -356,7 +356,7 @@ rule UsePublicHeaders
local headers ; local headers ;
for i in $(list) { for i in $(list) {
headers += [ FDirName $(OBOS_TOP) headers obos public $(i) ] ; headers += [ FDirName $(OBOS_TOP) headers $(i) ] ;
} }
UseHeaders $(headers) : $(targets) ; UseHeaders $(headers) : $(targets) ;
@@ -377,7 +377,7 @@ rule UsePrivateHeaders
local headers ; local headers ;
for i in $(list) { for i in $(list) {
headers += [ FDirName $(OBOS_TOP) headers obos private $(i) ] ; headers += [ FDirName $(OBOS_TOP) headers private $(i) ] ;
} }
UseHeaders $(headers) : $(targets) ; UseHeaders $(headers) : $(targets) ;
@@ -416,12 +416,23 @@ rule UseCppUnitHeaders
rule UseArchHeaders rule UseArchHeaders
{ {
# usage: UseArchHeaders <arch> # usage: UseArchHeaders <arch> : [ <sources_or_objects> ] ;
# <arch> specifies the architecture (e.g. x86). # <arch> specifies the architecture (e.g. x86).
# <sources_or_objects> Source or object files.
local headers = [ FDirName $(OBOS_TOP) headers private kernel arch $(1) ] ;
local targets = $(2) ;
local opt = -D$(OBOS_TARGET_DEFINE) ; local opt = -D$(OBOS_TARGET_DEFINE) ;
SubDirCcFlags $(opt) ;
SubDirC++Flags $(opt) ; if $(targets) {
SubDirHdrs [ FDirName $(OBOS_TOP) headers obos private kernel arch $(1) ] ; ObjectCcFlags $(targets) : $(opt) ;
ObjectC++Flags $(targets) : $(opt) ;
ObjectHdrs $(targets) : $(headers) ;
} else {
SubDirCcFlags $(opt) ;
SubDirC++Flags $(opt) ;
SubDirHdrs $(headers) ;
}
} }
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@@ -533,6 +544,7 @@ rule SetupKernel
local _objs = $(1:S=$(SUFOBJ)) ; local _objs = $(1:S=$(SUFOBJ)) ;
UsePublicHeaders kernel ; UsePublicHeaders kernel ;
UsePublicHeaders [ FDirName os kernel ] ;
UsePrivateHeaders kernel ; UsePrivateHeaders kernel ;
UseArchHeaders $(OBOS_ARCH) ; UseArchHeaders $(OBOS_ARCH) ;