Author: bonefish Date: 2011-06-14 02:41:12 +0200 (Tue, 14 Jun 2011) New Revision: 42162 Changeset: https://dev.haiku-os.org/changeset/42162 Modified: haiku/trunk/build/jam/HeadersRules Log: Small style cleanup. Modified: haiku/trunk/build/jam/HeadersRules =================================================================== --- haiku/trunk/build/jam/HeadersRules 2011-06-14 00:09:33 UTC (rev 42161) +++ haiku/trunk/build/jam/HeadersRules 2011-06-14 00:41:12 UTC (rev 42162) @@ -3,14 +3,22 @@ # # 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 { # SubDirSysHdrs <dirs> ; @@ -25,6 +33,7 @@ SUBDIRSYSHDRS += [ FDirName $(1) ] ; } + rule ObjectSysHdrs { # ObjectSysHdrs <sources or objects> : <headers> : <gristed objects> @@ -75,6 +84,7 @@ } } + rule SourceHdrs { # SourceHdrs <sources> : <headers> [ : <gristed objects> ] ; @@ -95,6 +105,7 @@ HDRSEARCH on $(sources) += $(headers) ; } + rule SourceSysHdrs { # SourceSysHdrs <sources> : <headers> [ : <gristed objects> ] ; @@ -115,6 +126,7 @@ HDRSEARCH on $(sources) += $(headers) ; } + rule PublicHeaders { # PublicHeaders <group list> @@ -131,6 +143,7 @@ return $(dirs) ; } + rule PrivateHeaders { # PrivateHeaders <group list> @@ -146,6 +159,7 @@ return $(dirs) ; } + rule LibraryHeaders { # LibraryHeaders <group list> @@ -161,6 +175,7 @@ return $(dirs) ; } + rule ArchHeaders { # usage: ArchHeaders <arch> ; @@ -170,6 +185,7 @@ return [ FDirName $(HAIKU_TOP) headers private kernel arch $(1) ] ; } + rule UseHeaders { # UseHeaders <headers> [ : <system> ] ; @@ -192,6 +208,7 @@ } } + rule UsePublicHeaders { # UsePublicHeaders <group list> ; @@ -204,6 +221,7 @@ UseHeaders [ PublicHeaders $(1) ] : true ; } + rule UsePublicObjectHeaders { # UsePublicObjectHeaders <sources> : <group list> [ : <objects> ] ; @@ -215,6 +233,7 @@ SourceSysHdrs $(1) : [ PublicHeaders $(2) ] : $(3) ; } + rule UsePrivateHeaders { # UsePrivateHeaders <group list> [ : <system> ] ; @@ -231,6 +250,7 @@ UseHeaders [ PrivateHeaders $(1) ] : $(system) ; } + rule UsePrivateObjectHeaders { # UsePrivateObjectHeaders <sources> : <group list> [ : <objects> @@ -252,11 +272,13 @@ } } + rule UseCppUnitHeaders { SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers tools cppunit ] ; } + rule UseCppUnitObjectHeaders { # UseCppUnitObjectHeaders <sources> [ : <objects> ] ; @@ -264,6 +286,7 @@ : $(2) ; } + rule UseArchHeaders { # usage: UseArchHeaders <arch> ; @@ -276,6 +299,7 @@ UseHeaders $(headers) : true ; } + rule UseArchObjectHeaders { # usage: UseArchObjectHeaders <sources> : <arch> : [ <objects> ] ; @@ -296,6 +320,7 @@ SourceSysHdrs $(sources) : $(headers) : $(objects) ; } + rule UsePosixObjectHeaders { # UsePosixObjectHeaders <sources> [ : <objects> ] ; @@ -307,6 +332,7 @@ SourceSysHdrs $(1) : [ FDirName $(HAIKU_TOP) headers posix ] : $(2) ; } + rule UseLibraryHeaders { # UseLibraryHeaders <group list> ; @@ -318,6 +344,7 @@ UseHeaders [ LibraryHeaders $(1) ] : true ; } + rule UseLegacyHeaders { # usage: UseLegacyHeaders <group list> ; @@ -327,6 +354,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers legacy $(1) ] : true ; } + rule UseLegacyObjectHeaders { # UseLegacyObjectHeaders <sources> [ : <objects> ] ; @@ -338,16 +366,19 @@ 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 @@ [ PublicHeaders $(osIncludes) ] ; } + rule FStandardHeaders { local osIncludes = add-ons add-ons/file_system add-ons/graphics @@ -402,5 +434,6 @@ return $(headers) ; } + # SUBDIRSYSHDRS shall be reset automatically for each subdir SUBDIRRESET += SYSHDRS ;