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

added system private header 'libroot' so that headers/private/kernel doesn't become filled with non-kernel library stuff

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1692 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Daniel Reinhold
2002-10-26 20:13:01 +00:00
parent 43ce4edcbe
commit be36cedec2
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+21 -20
View File
@@ -146,21 +146,23 @@ OBOS_FLOPPY = floppy.$(OBOS_ARCH) ;
rule SetupIncludes rule SetupIncludes
{ {
# XXX add "mail" and "opengl" later # XXX add "mail" and "opengl" later
local os_includes = add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media midi midi2 net storage support translation ; OS_INCLUDES ?= . add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media midi midi2 net storage support translation ;
# Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times. # include the local directory
UseHeaders . ;
# Use headers directory, to allow to do things like include <posix/string.h> # Use headers directory, to allow to do things like include <posix/string.h>
HDRS = [ FDirName $(OBOS_TOP) headers ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers ] ;
# Use posix headers directory # Use posix headers directory
HDRS += [ FDirName $(OBOS_TOP) headers posix ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers posix ] ;
# Use public OS header directories # Use public OS header directories
HDRS += [ PublicHeaders $(os_includes) ] ; UseHeaders [ PublicHeaders $(OS_INCLUDES) ] ;
# Used as a fallback, the R5 header directories (we should remove this as soon as possible) # Used as a fallback, the R5 header directories (we should remove this as soon as possible)
HDRS += /boot/develop/headers/posix /boot/develop/headers/cpp ; UseHeaders /boot/develop/headers/posix ;
UseHeaders /boot/develop/headers/cpp ;
} }
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@@ -293,8 +295,6 @@ rule TestLib
local headerDirs = $(5) ; local headerDirs = $(5) ;
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : $(headerDirs) ; TestObjects $(sources) : $(headerDirs) ;
@@ -322,8 +322,6 @@ rule R5TestLib
local libraries = $(4) ; local libraries = $(4) ;
local objects = [ R5ObjectNames $(sources) ] ; local objects = [ R5ObjectNames $(sources) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : : true ; TestObjects $(sources) : : true ;
@@ -372,8 +370,6 @@ rule UnitTest
local headerDirs = $(5) ; local headerDirs = $(5) ;
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : $(headerDirs) ; TestObjects $(sources) : $(headerDirs) ;
@@ -400,8 +396,6 @@ rule R5UnitTest
local libraries = $(4) ; local libraries = $(4) ;
local objects = [ R5ObjectNames $(sources) ] ; local objects = [ R5ObjectNames $(sources) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : : true ; TestObjects $(sources) : : true ;
@@ -459,7 +453,6 @@ rule TestObjects
OPTIM = ; OPTIM = ;
} }
SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
# compile # compile
@@ -784,6 +777,7 @@ rule UseHeaders
rule UseCppUnitHeaders rule UseCppUnitHeaders
{ {
SetupIncludes ; #serious hack
SubDirHdrs [ FDirName $(OBOS_TOP) headers tools cppunit ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers tools cppunit ] ;
} }
@@ -1091,14 +1085,20 @@ rule SetupKernel
local _objs = $(1:S=$(SUFOBJ)) ; local _objs = $(1:S=$(SUFOBJ)) ;
#Setup Kernel header directories # XXX add "mail" and "opengl" later
local kernel_includes = add-ons/file_system add-ons/graphics device drivers kernel storage support ; OS_INCLUDES ?= . add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media midi midi2 net storage support translation ;
# include current directory
UseHeaders . ;
# Use posix headers directory # Use posix headers directory
HDRS = [ FDirName $(OBOS_TOP) headers posix ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers posix ] ;
# Use public OS header directories # Use public OS header directories
HDRS += [ PublicHeaders $(kernel_includes) ] ; UseHeaders [ PublicHeaders $(OS_INCLUDES) ] ;
UsePrivateHeaders kernel ; UsePrivateHeaders kernel ;
UsePrivateHeaders libroot ;
UseArchHeaders $(OBOS_ARCH) ; UseArchHeaders $(OBOS_ARCH) ;
SetupObjectsDir ; SetupObjectsDir ;
@@ -1350,6 +1350,8 @@ FT2_LIB = freetype ;
rule UseFreeTypeHeaders rule UseFreeTypeHeaders
{ {
SubDirHdrs $(FT2_INCLUDE) ; SubDirHdrs $(FT2_INCLUDE) ;
SetupIncludes ;
} }
rule UseFreeTypeObjectHeaders rule UseFreeTypeObjectHeaders
@@ -1382,7 +1384,6 @@ rule FT2_Library
local library = lib$(1).so ; local library = lib$(1).so ;
local sources = $(2) ; local sources = $(2) ;
SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(sources) ; MakeLocateObjects $(sources) ;
Objects $(sources) ; Objects $(sources) ;