From 085f6723a41e1980a3bd03ff7b68c8869feb513d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 17 Jul 2011 02:52:26 +0200 Subject: [PATCH] Fix build due to move Apparently I should have done a complete rebuild after moving directories.h from headers/private/libroot to .../system, since a lot of stuff didn't build anymore. --- headers/build/private/libroot/directories.h | 1 - headers/build/private/system/directories.h | 1 + src/add-ons/kernel/debugger/hangman/Jamfile | 2 +- .../kernel/drivers/audio/ac97/auich/Jamfile | 3 ++- .../kernel/drivers/audio/ac97/auvia/Jamfile | 3 ++- src/add-ons/kernel/drivers/audio/echo/3g/Jamfile | 7 ++++--- src/add-ons/kernel/drivers/audio/emuxki/Jamfile | 3 ++- .../kernel/drivers/graphics/matrox/Jamfile | 5 +++-- .../kernel/drivers/graphics/neomagic/Jamfile | 5 +++-- .../kernel/drivers/graphics/nvidia/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/sis900/Jamfile | 15 ++++++++------- src/add-ons/kernel/generic/mpu401/Jamfile | 2 +- src/build/libroot/Jamfile | 2 +- 13 files changed, 31 insertions(+), 23 deletions(-) delete mode 100644 headers/build/private/libroot/directories.h create mode 100644 headers/build/private/system/directories.h diff --git a/headers/build/private/libroot/directories.h b/headers/build/private/libroot/directories.h deleted file mode 100644 index f5eb3aff4e..0000000000 --- a/headers/build/private/libroot/directories.h +++ /dev/null @@ -1 +0,0 @@ -#include <../private/libroot/directories.h> diff --git a/headers/build/private/system/directories.h b/headers/build/private/system/directories.h new file mode 100644 index 0000000000..f901e61880 --- /dev/null +++ b/headers/build/private/system/directories.h @@ -0,0 +1 @@ +#include <../private/system/directories.h> diff --git a/src/add-ons/kernel/debugger/hangman/Jamfile b/src/add-ons/kernel/debugger/hangman/Jamfile index 1f07266e44..f144c702d7 100644 --- a/src/add-ons/kernel/debugger/hangman/Jamfile +++ b/src/add-ons/kernel/debugger/hangman/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel debugger hangman ; SetSubDirSupportedPlatformsBeOSCompatible ; # UsePrivateHeaders drivers ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; KernelAddon hangman : diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile index 26d6af1cca..1fbdc219cf 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile +++ b/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auich ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders libroot media ; +UsePrivateSystemHeaders ; +UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ; diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile index 9333f4295b..f57a5b1180 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auvia ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders libroot media ; +UsePrivateHeaders media ; +UsePrivateSystemHeaders ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ; diff --git a/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile b/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile index 6a25fd102d..5c5f3c7b1a 100644 --- a/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile +++ b/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile @@ -12,8 +12,9 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic DSP ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ASIC ; -UsePrivateHeaders [ FDirName kernel ] # For kernel_cpp.cpp - libroot media ; +UsePrivateSystemHeaders ; +UsePrivateHeaders kernel # For kernel_cpp.cpp + media ; # set some additional defines SubDirCcFlags -DECHO_BEOS -DECHO3G_FAMILY ; @@ -62,7 +63,7 @@ SEARCH on [ FGristFiles ] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ] ; SEARCH on [ FGristFiles - kernel_cpp.cpp + kernel_cpp.cpp ] = [ FDirName $(HAIKU_TOP) src system kernel util ] ; SEARCH on [ FGristFiles diff --git a/src/add-ons/kernel/drivers/audio/emuxki/Jamfile b/src/add-ons/kernel/drivers/audio/emuxki/Jamfile index f3f71b1e67..2351edf86b 100644 --- a/src/add-ons/kernel/drivers/audio/emuxki/Jamfile +++ b/src/add-ons/kernel/drivers/audio/emuxki/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio emuxki ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders libroot media ; +UsePrivateSystemHeaders ; +UsePrivateHeaders media ; KernelAddon emuxki : ac97.c diff --git a/src/add-ons/kernel/drivers/graphics/matrox/Jamfile b/src/add-ons/kernel/drivers/graphics/matrox/Jamfile index fc53de96a5..4831e722cc 100644 --- a/src/add-ons/kernel/drivers/graphics/matrox/Jamfile +++ b/src/add-ons/kernel/drivers/graphics/matrox/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics matrox ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders graphics libroot ; +UsePrivateSystemHeaders ; +UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics matrox ] ; KernelAddon matrox : @@ -12,7 +13,7 @@ KernelAddon matrox : Package haiku-matrox-cvs : README.html UPDATE.html ; Package haiku-matrox-cvs : - matrox : + matrox : boot home config add-ons kernel drivers bin ; PackageDriverSymLink haiku-matrox-cvs : graphics matrox ; Package haiku-matrox-cvs : diff --git a/src/add-ons/kernel/drivers/graphics/neomagic/Jamfile b/src/add-ons/kernel/drivers/graphics/neomagic/Jamfile index 3ea2159453..0e8146d538 100644 --- a/src/add-ons/kernel/drivers/graphics/neomagic/Jamfile +++ b/src/add-ons/kernel/drivers/graphics/neomagic/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics neomagic ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders graphics libroot ; +UsePrivateSystemHeaders ; +UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics neomagic ] ; KernelAddon neomagic : @@ -12,7 +13,7 @@ KernelAddon neomagic : Package haiku-neomagic-cvs : README.html UPDATE.html ; Package haiku-neomagic-cvs : - neomagic : + neomagic : boot home config add-ons kernel drivers bin ; PackageDriverSymLink haiku-neomagic-cvs : graphics neomagic ; Package haiku-neomagic-cvs : diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/Jamfile b/src/add-ons/kernel/drivers/graphics/nvidia/Jamfile index 3ec19127f2..c477c2747f 100644 --- a/src/add-ons/kernel/drivers/graphics/nvidia/Jamfile +++ b/src/add-ons/kernel/drivers/graphics/nvidia/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics nvidia ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders graphics libroot ; +UsePrivateHeaders graphics ; +UsePrivateSystemHeaders ; UsePrivateHeaders [ FDirName graphics nvidia ] ; UsePrivateHeaders [ FDirName graphics common ] ; @@ -13,7 +14,7 @@ KernelAddon nvidia : Package haiku-nvidia-cvs : README.html UPDATE.html ; Package haiku-nvidia-cvs : - nvidia : + nvidia : boot home config add-ons kernel drivers bin ; PackageDriverSymLink haiku-nvidia-cvs : graphics nvidia ; Package haiku-nvidia-cvs : diff --git a/src/add-ons/kernel/drivers/network/sis900/Jamfile b/src/add-ons/kernel/drivers/network/sis900/Jamfile index e7e994bd18..839a89b7a7 100644 --- a/src/add-ons/kernel/drivers/network/sis900/Jamfile +++ b/src/add-ons/kernel/drivers/network/sis900/Jamfile @@ -3,8 +3,9 @@ SubDir HAIKU_TOP src add-ons kernel drivers network sis900 ; SetSubDirSupportedPlatformsBeOSCompatible ; +UsePrivateSystemHeaders ; # For ether_driver.h -UsePrivateHeaders libroot net ; +UsePrivateHeaders net ; KernelAddon sis900 : driver.c @@ -14,7 +15,7 @@ KernelAddon sis900 : ; Package haiku-sis900-cvs : - sis900 : + sis900 : boot home config add-ons kernel drivers bin ; PackageDriverSymLink haiku-sis900-cvs : net sis900 ; Package haiku-sis900-cvs : @@ -45,12 +46,12 @@ actions ignore InstallSiS900 # Installation -HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : - sis900 +HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : + sis900 ; -HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : - sis900 : - installed-symlink +HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : + sis900 : + installed-symlink ; diff --git a/src/add-ons/kernel/generic/mpu401/Jamfile b/src/add-ons/kernel/generic/mpu401/Jamfile index 61b9be3883..32bc4236c9 100644 --- a/src/add-ons/kernel/generic/mpu401/Jamfile +++ b/src/add-ons/kernel/generic/mpu401/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons kernel generic mpu401 ; -UsePrivateHeaders libroot ; +UsePrivateSystemHeaders ; KernelAddon mpu401 : mpu401.c diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile index d704520320..34f947ed00 100644 --- a/src/build/libroot/Jamfile +++ b/src/build/libroot/Jamfile @@ -9,7 +9,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build os interface ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build os storage ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ; -UsePrivateBuildHeaders kernel libroot ; +UsePrivateBuildHeaders kernel system ; { local defines = [ FDefines