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

Fix build due to <directories.h> move

Browse Source 
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.
This commit is contained in:
Ingo Weinhold
2011-11-25 06:19:50 +01:00
parent 9213e9d6a8
commit 085f6723a4
13 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/private/libroot/directories.h
-1
View File
@@ -1 +0,0 @@
#include <../private/libroot/directories.h>
headers/build/private/system/directories.h
+1
View File
@@ -0,0 +1 @@
#include <../private/system/directories.h>
src/add-ons/kernel/debugger/hangman/Jamfile
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel debugger hangman ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# UsePrivateHeaders drivers ; # UsePrivateHeaders drivers ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
KernelAddon <kdebug>hangman : KernelAddon <kdebug>hangman :
src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile
+2 -1
View File
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auich ; SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auich ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders libroot media ; UsePrivateSystemHeaders ;
UsePrivateHeaders media ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ;
src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile
+2 -1
View File
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auvia ; SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auvia ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders libroot media ; UsePrivateHeaders media ;
UsePrivateSystemHeaders ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ;
src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
+4 -3
View File
@@ -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 DSP ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ASIC ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ASIC ;
UsePrivateHeaders [ FDirName kernel ] # For kernel_cpp.cpp UsePrivateSystemHeaders ;
libroot media ; UsePrivateHeaders kernel # For kernel_cpp.cpp
media ;
# set some additional defines # set some additional defines
SubDirCcFlags -DECHO_BEOS -DECHO3G_FAMILY ; SubDirCcFlags -DECHO_BEOS -DECHO3G_FAMILY ;
@@ -62,7 +63,7 @@ SEARCH on [ FGristFiles
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ] ; ] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ] ;
SEARCH on [ FGristFiles SEARCH on [ FGristFiles
kernel_cpp.cpp kernel_cpp.cpp
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ; ] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
SEARCH on [ FGristFiles SEARCH on [ FGristFiles
src/add-ons/kernel/drivers/audio/emuxki/Jamfile
+2 -1
View File
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio emuxki ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders libroot media ; UsePrivateSystemHeaders ;
UsePrivateHeaders media ;
KernelAddon emuxki : KernelAddon emuxki :
ac97.c ac97.c
src/add-ons/kernel/drivers/graphics/matrox/Jamfile
+3 -2
View File
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics matrox ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics libroot ; UsePrivateSystemHeaders ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics matrox ] ; UsePrivateHeaders [ FDirName graphics matrox ] ;
KernelAddon matrox : KernelAddon matrox :
@@ -12,7 +13,7 @@ KernelAddon matrox :
Package haiku-matrox-cvs : Package haiku-matrox-cvs :
README.html UPDATE.html ; README.html UPDATE.html ;
Package haiku-matrox-cvs : Package haiku-matrox-cvs :
matrox : matrox :
boot home config add-ons kernel drivers bin ; boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-matrox-cvs : graphics matrox ; PackageDriverSymLink haiku-matrox-cvs : graphics matrox ;
Package haiku-matrox-cvs : Package haiku-matrox-cvs :
src/add-ons/kernel/drivers/graphics/neomagic/Jamfile
+3 -2
View File
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics neomagic ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics libroot ; UsePrivateSystemHeaders ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics neomagic ] ; UsePrivateHeaders [ FDirName graphics neomagic ] ;
KernelAddon neomagic : KernelAddon neomagic :
@@ -12,7 +13,7 @@ KernelAddon neomagic :
Package haiku-neomagic-cvs : Package haiku-neomagic-cvs :
README.html UPDATE.html ; README.html UPDATE.html ;
Package haiku-neomagic-cvs : Package haiku-neomagic-cvs :
neomagic : neomagic :
boot home config add-ons kernel drivers bin ; boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-neomagic-cvs : graphics neomagic ; PackageDriverSymLink haiku-neomagic-cvs : graphics neomagic ;
Package haiku-neomagic-cvs : Package haiku-neomagic-cvs :
src/add-ons/kernel/drivers/graphics/nvidia/Jamfile
+3 -2
View File
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics nvidia ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics libroot ; UsePrivateHeaders graphics ;
UsePrivateSystemHeaders ;
UsePrivateHeaders [ FDirName graphics nvidia ] ; UsePrivateHeaders [ FDirName graphics nvidia ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
@@ -13,7 +14,7 @@ KernelAddon nvidia :
Package haiku-nvidia-cvs : Package haiku-nvidia-cvs :
README.html UPDATE.html ; README.html UPDATE.html ;
Package haiku-nvidia-cvs : Package haiku-nvidia-cvs :
nvidia : nvidia :
boot home config add-ons kernel drivers bin ; boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-nvidia-cvs : graphics nvidia ; PackageDriverSymLink haiku-nvidia-cvs : graphics nvidia ;
Package haiku-nvidia-cvs : Package haiku-nvidia-cvs :
src/add-ons/kernel/drivers/network/sis900/Jamfile
+8 -7
View File
@@ -3,8 +3,9 @@ SubDir HAIKU_TOP src add-ons kernel drivers network sis900 ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateSystemHeaders ;
# For ether_driver.h # For ether_driver.h
UsePrivateHeaders libroot net ; UsePrivateHeaders net ;
KernelAddon sis900 : KernelAddon sis900 :
driver.c driver.c
@@ -14,7 +15,7 @@ KernelAddon sis900 :
; ;
Package haiku-sis900-cvs : Package haiku-sis900-cvs :
sis900 : sis900 :
boot home config add-ons kernel drivers bin ; boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-sis900-cvs : net sis900 ; PackageDriverSymLink haiku-sis900-cvs : net sis900 ;
Package haiku-sis900-cvs : Package haiku-sis900-cvs :
@@ -45,12 +46,12 @@ actions ignore InstallSiS900
# Installation # Installation
HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin :
sis900 sis900
; ;
HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net :
<installed>sis900 : <installed>sis900 :
installed-symlink installed-symlink
; ;
src/add-ons/kernel/generic/mpu401/Jamfile
+1 -1
View File
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel generic mpu401 ; SubDir HAIKU_TOP src add-ons kernel generic mpu401 ;
UsePrivateHeaders libroot ; UsePrivateSystemHeaders ;
KernelAddon mpu401 : KernelAddon mpu401 :
mpu401.c mpu401.c
src/build/libroot/Jamfile
+1 -1
View File
@@ -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 storage ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
UsePrivateBuildHeaders kernel libroot ; UsePrivateBuildHeaders kernel system ;
{ {
local defines = [ FDefines local defines = [ FDefines