Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small style cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42162 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2011-06-14 00:41:12 +00:00
parent 08c7202f8a
commit af9a2c4e23
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build/jam/HeadersRules
View File

@ -3,13 +3,21 @@
#
# Overridden to support a second argument, the option to be used.
#
rule FIncludes { return $(2:E="--bad-include-option ")$(1) ; }
rule FIncludes
{
return $(2:E="--bad-include-option ")$(1) ;
}
# FSysIncludes <dirs> ;
#
# Counterpart of FIncludes for system include search paths.
#
rule FSysIncludes { return $(2:E="--bad-include-option ")$(1) ; }
rule FSysIncludes
{
return $(2:E="--bad-include-option ")$(1) ;
}
rule SubDirSysHdrs
{
@ -25,6 +33,7 @@ rule SubDirSysHdrs
SUBDIRSYSHDRS += [ FDirName $(1) ] ;
}
rule ObjectSysHdrs
{
# ObjectSysHdrs <sources or objects> : <headers> : <gristed objects>
@ -75,6 +84,7 @@ rule ObjectSysHdrs
}
}
rule SourceHdrs
{
# SourceHdrs <sources> : <headers> [ : <gristed objects> ] ;
@ -95,6 +105,7 @@ rule SourceHdrs
HDRSEARCH on $(sources) += $(headers) ;
}
rule SourceSysHdrs
{
# SourceSysHdrs <sources> : <headers> [ : <gristed objects> ] ;
@ -115,6 +126,7 @@ rule SourceSysHdrs
HDRSEARCH on $(sources) += $(headers) ;
}
rule PublicHeaders
{
# PublicHeaders <group list>
@ -131,6 +143,7 @@ rule PublicHeaders
return $(dirs) ;
}
rule PrivateHeaders
{
# PrivateHeaders <group list>
@ -146,6 +159,7 @@ rule PrivateHeaders
return $(dirs) ;
}
rule LibraryHeaders
{
# LibraryHeaders <group list>
@ -161,6 +175,7 @@ rule LibraryHeaders
return $(dirs) ;
}
rule ArchHeaders
{
# usage: ArchHeaders <arch> ;
@ -170,6 +185,7 @@ rule ArchHeaders
return [ FDirName $(HAIKU_TOP) headers private kernel arch $(1) ] ;
}
rule UseHeaders
{
# UseHeaders <headers> [ : <system> ] ;
@ -192,6 +208,7 @@ rule UseHeaders
}
}
rule UsePublicHeaders
{
# UsePublicHeaders <group list> ;
@ -204,6 +221,7 @@ rule UsePublicHeaders
UseHeaders [ PublicHeaders $(1) ] : true ;
}
rule UsePublicObjectHeaders
{
# UsePublicObjectHeaders <sources> : <group list> [ : <objects> ] ;
@ -215,6 +233,7 @@ rule UsePublicObjectHeaders
SourceSysHdrs $(1) : [ PublicHeaders $(2) ] : $(3) ;
}
rule UsePrivateHeaders
{
# UsePrivateHeaders <group list> [ : <system> ] ;
@ -231,6 +250,7 @@ rule UsePrivateHeaders
UseHeaders [ PrivateHeaders $(1) ] : $(system) ;
}
rule UsePrivateObjectHeaders
{
# UsePrivateObjectHeaders <sources> : <group list> [ : <objects>
@ -252,11 +272,13 @@ rule UsePrivateObjectHeaders
}
}
rule UseCppUnitHeaders
{
SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers tools cppunit ] ;
}
rule UseCppUnitObjectHeaders
{
# UseCppUnitObjectHeaders <sources> [ : <objects> ] ;
@ -264,6 +286,7 @@ rule UseCppUnitObjectHeaders
: $(2) ;
}
rule UseArchHeaders
{
# usage: UseArchHeaders <arch> ;
@ -276,6 +299,7 @@ rule UseArchHeaders
UseHeaders $(headers) : true ;
}
rule UseArchObjectHeaders
{
# usage: UseArchObjectHeaders <sources> : <arch> : [ <objects> ] ;
@ -296,6 +320,7 @@ rule UseArchObjectHeaders
SourceSysHdrs $(sources) : $(headers) : $(objects) ;
}
rule UsePosixObjectHeaders
{
# UsePosixObjectHeaders <sources> [ : <objects> ] ;
@ -307,6 +332,7 @@ rule UsePosixObjectHeaders
SourceSysHdrs $(1) : [ FDirName $(HAIKU_TOP) headers posix ] : $(2) ;
}
rule UseLibraryHeaders
{
# UseLibraryHeaders <group list> ;
@ -318,6 +344,7 @@ rule UseLibraryHeaders
UseHeaders [ LibraryHeaders $(1) ] : true ;
}
rule UseLegacyHeaders
{
# usage: UseLegacyHeaders <group list> ;
@ -327,6 +354,7 @@ rule UseLegacyHeaders
UseHeaders [ FDirName $(HAIKU_TOP) headers legacy $(1) ] : true ;
}
rule UseLegacyObjectHeaders
{
# UseLegacyObjectHeaders <sources> [ : <objects> ] ;
@ -338,16 +366,19 @@ rule UseLegacyObjectHeaders
SourceSysHdrs $(1) : [ FDirName $(HAIKU_TOP) headers legacy ] : $(2) ;
}
rule UsePrivateKernelHeaders
{
UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
}
rule UsePrivateSystemHeaders
{
UseHeaders $(TARGET_PRIVATE_SYSTEM_HEADERS) : true ;
}
rule FStandardOSHeaders
{
local osIncludes = add-ons add-ons/file_system add-ons/graphics
@ -361,6 +392,7 @@ rule FStandardOSHeaders
[ PublicHeaders $(osIncludes) ] ;
}
rule FStandardHeaders
{
local osIncludes = add-ons add-ons/file_system add-ons/graphics
@ -402,5 +434,6 @@ rule FStandardHeaders
return $(headers) ;
}
# SUBDIRSYSHDRS shall be reset automatically for each subdir
SUBDIRRESET += SYSHDRS ;