[openbeos] Re: big kernel - shouting

On Wed, 2005-04-13 at 17:25 +0200, Philipp Schmid wrote:

> after your move the following targets won't build (i stripped
> the ...patience... lines):

and here is a svn diff to fix it.

greets philipp



Index: src/add-ons/kernel/bus_managers/pci/Jamfile
===================================================================
--- src/add-ons/kernel/bus_managers/pci/Jamfile (revision 12361)
+++ src/add-ons/kernel/bus_managers/pci/Jamfile (working copy)
@@ -13,7 +13,7 @@
 
 SEARCH on [ FGristFiles
                kernel_cpp.cpp 
-       ] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+       ] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 # pci_info.cpp currently needs pcihdr.h so we make its path available
 ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ]
Index: src/add-ons/kernel/file_systems/bfs/Jamfile
===================================================================
--- src/add-ons/kernel/file_systems/bfs/Jamfile (revision 12361)
+++ src/add-ons/kernel/file_systems/bfs/Jamfile (working copy)
@@ -50,7 +50,7 @@
 
 SEARCH on [ FGristFiles
                kernel_cpp.cpp 
-       ] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+       ] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 # restore original optimization level
 OPTIM = $(oldOPTIM) ;
Index: src/add-ons/kernel/network/ppp/shared/libppp/Jamfile
===================================================================
--- src/add-ons/kernel/network/ppp/shared/libppp/Jamfile        (revision 12361)
+++ src/add-ons/kernel/network/ppp/shared/libppp/Jamfile        (working copy)
@@ -18,7 +18,7 @@
        PPPManager.cpp
 ;
 
-SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src kernel 
libroot posix string ] ;
-SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src 
kernel libroot os ] ;
+SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src system 
libroot posix string ] ;
+SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src 
system libroot os ] ;
 SEARCH on [ FGristFiles settings_tools.cpp ] = [ FDirName $(OBOS_TOP) src 
add-ons kernel network ppp shared libkernelppp ] ;
 SEARCH on [ FGristFiles KPPPUtils.cpp ] = [ FDirName $(OBOS_TOP) src add-ons 
kernel network ppp shared libkernelppp ] ;
Index: src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
===================================================================
--- src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile  (revision 12361)
+++ src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile  (working copy)
@@ -36,5 +36,5 @@
        _KPPPPFCHandler.cpp
 ;
 
-SEARCH on [ FGristFiles kernel_cpp.cpp ] = [ FDirName $(OBOS_TOP) src kernel 
core util ] ;
-SEARCH on [ FGristFiles Locker.cpp ] = [ FDirName $(OBOS_TOP) src kernel core 
disk_device_manager ] ;
+SEARCH on [ FGristFiles kernel_cpp.cpp ] = [ FDirName $(OBOS_TOP) src system 
kernel util ] ;
+SEARCH on [ FGristFiles Locker.cpp ] = [ FDirName $(OBOS_TOP) src system 
kernel disk_device_manager ] ;
Index: src/servers/syslog_daemon/Jamfile
===================================================================
--- src/servers/syslog_daemon/Jamfile   (revision 12361)
+++ src/servers/syslog_daemon/Jamfile   (working copy)
@@ -17,4 +17,4 @@
 
 SEARCH on [ FGristFiles
                strlcpy.c
-       ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+       ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
Index: src/kits/network/libbind/Jamfile
===================================================================
--- src/kits/network/libbind/Jamfile    (revision 12361)
+++ src/kits/network/libbind/Jamfile    (working copy)
@@ -4,8 +4,8 @@
 UseHeaders [ FDirName $(SUBDIR) headers ] ;
 
 # our libroot contains functions that are missing in BeOS (e.g.: strlcat)
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot posix pthread ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot posix pthread ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
 
 # private sources for this port
 SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
Index: src/kits/Jamfile
===================================================================
--- src/kits/Jamfile    (revision 12361)
+++ src/kits/Jamfile    (working copy)
@@ -97,10 +97,10 @@
 
 SEARCH on [ FGristFiles
                strlcat.c strlcpy.c
-       ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+       ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
 
 SEARCH on [ FGristFiles KMessage.cpp ]
-       = [ FDirName $(OBOS_TOP) src kernel core messaging ] ;
+       = [ FDirName $(OBOS_TOP) src system kernel messaging ] ;
 
 SubInclude OBOS_TOP src kits app ;
 SubInclude OBOS_TOP src kits debug ;

Other related posts: