* Introduced new header directory headers/private/system which is supposed
to contain headers shared by kernel and userland (mainly libroot). * Moved quite a few private kernel headers to the new location. Split several kernel headers into a shared part and one that is still kernel private. Adjusted all affected Jamfiles and source in the standard x86 build accordingly. The build for other architectures and for test code may be broken. * Quite a bit of userland code still includes private kernel headers. Mostly those are <util/*> headers. The ones that aren't strictly kernel-only should be moved to some other place (maybe headers/private/shared/util). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25486 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -323,11 +323,17 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 {
|
||||
HAIKU_DEFINES += _BEOS_R5_COMPATIBLE_ ;
|
||||
}
|
||||
|
||||
# private shared kernel/libroot headers
|
||||
HAIKU_PRIVATE_SYSTEM_HEADERS =
|
||||
[ PrivateHeaders $(DOT) system system/arch/$(HAIKU_ARCH) ]
|
||||
;
|
||||
|
||||
# private kernel headers to be used when compiling kernel code
|
||||
HAIKU_PRIVATE_KERNEL_HEADERS =
|
||||
[ PrivateHeaders $(DOT) kernel libroot
|
||||
kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ]
|
||||
[ ArchHeaders $(HAIKU_ARCH) ]
|
||||
$(HAIKU_PRIVATE_SYSTEM_HEADERS)
|
||||
;
|
||||
|
||||
# Add some grist to the libgcc objects
|
||||
@@ -550,6 +556,9 @@ if $(HOST_ARCH) = x86 && $(HAIKU_HOST_USE_32BIT) = 1 {
|
||||
# private kernel headers do be used when compiling kernel code
|
||||
HOST_PRIVATE_KERNEL_HEADERS = ;
|
||||
|
||||
# private shared kernel/libroot headers
|
||||
HOST_PRIVATE_SYSTEM_HEADERS = ;
|
||||
|
||||
# under BeOS use copyattr instead of cp
|
||||
if $(HOST_PLATFORM_BEOS_COMPATIBLE)
|
||||
{
|
||||
@@ -748,6 +757,7 @@ local buildVars =
|
||||
KERNEL_DEBUG_$(HAIKU_DEBUG_LEVELS)_C++FLAGS
|
||||
|
||||
PRIVATE_KERNEL_HEADERS
|
||||
PRIVATE_SYSTEM_HEADERS
|
||||
|
||||
LIBSTDC++ LIBSUPC++
|
||||
|
||||
|
||||
Reference in New Issue
Block a user