* Reorganized the sources. Haiku and BeOS kernel interface each have their own

subdirectory, now.
* Moved all code specific to a kernel interface into the respective library.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29344 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/file_systems/userlandfs/server/Jamfile

@@ -8,9 +8,6 @@ SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
 
-UsePrivateSystemHeaders ;
-UsePrivateHeaders libroot ;
-
 SEARCH_SOURCE += [ FDirName $(userlandFSTop) private ] ;
 SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
 
@@ -19,57 +16,38 @@ DEFINES += DEBUG_APP="\\\"UserlandFSServer\\\"" ;
 DEFINES += BUILDING_USERLAND_FS_SERVER=1 ;
 
 Application UserlandFSServer
-	: AreaSupport.cpp
+	:
-	  Debug.cpp
+	AreaSupport.cpp
-	  DispatcherDefs.cpp
+	Debug.cpp
-	  driver_settings.c
+	DispatcherDefs.cpp
-	  LazyInitializable.cpp
+	driver_settings.c
-	  Locker.cpp
+	LazyInitializable.cpp
-	  ObjectTracker.cpp
+	Locker.cpp
-	  Port.cpp
+	ObjectTracker.cpp
-	  Referencable.cpp
+	Port.cpp
-	  Request.cpp
+	Referencable.cpp
-	  RequestAllocator.cpp
+	Request.cpp
-	  RequestHandler.cpp
+	RequestAllocator.cpp
-	  RequestPort.cpp
+	RequestHandler.cpp
-	  Requests.cpp
+	RequestPort.cpp
-	  SingleReplyRequestHandler.cpp
+	Requests.cpp
-	  String.cpp
+	SingleReplyRequestHandler.cpp
+	String.cpp
 
-#	  beos_fs_cache.c
+	DispatcherFileSystem.cpp
+	FileSystem.cpp
+	kernel_emu.cpp
+	main.cpp
+	RequestThread.cpp
+	ServerDefs.cpp
+	UserlandFSDispatcher.cpp
+	UserlandFSServer.cpp
+	UserlandRequestHandler.cpp
+	Volume.cpp
 
-#	  beos_lock.cpp
+	:
-#	  BeOSKernelFileSystem.cpp
+	be
-#	  BeOSKernelVolume.cpp
-	  DispatcherFileSystem.cpp
-	  FileSystem.cpp
-	  haiku_block_cache.cpp
-	  haiku_condition_variable.cpp
-#	  haiku_file_cache.cpp
-	  haiku_hash.cpp
-	  haiku_lock.cpp
-	  haiku_slab.cpp
-	  HaikuKernelFileSystem.cpp
-	  HaikuKernelVolume.cpp
-	  kernel_emu.cpp
-	  main.cpp
-	  RequestThread.cpp
-	  ServerDefs.cpp
-	  UserlandFSDispatcher.cpp
-	  UserlandFSServer.cpp
-	  UserlandRequestHandler.cpp
-	  Volume.cpp
-	: be
 ;
 
-# the library providing the BeOS kernel interface for add-ons
+HaikuSubInclude beos ;
-SharedLibrary libuserlandfs_beos_kernel.so
+HaikuSubInclude haiku ;
-	: beos_kernel_emu.cpp
-	: <nogrist>UserlandFSServer
-;
-
-# the library providing the Haiku kernel interface for add-ons
-SharedLibrary libuserlandfs_haiku_kernel.so
-	: haiku_kernel_emu.cpp
-	: <nogrist>UserlandFSServer
-;

src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile

@@ -0,0 +1,30 @@
+SubDir HAIKU_TOP src add-ons kernel file_systems userlandfs server beos ;
+
+local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel
+	file_systems userlandfs ] ;
+local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
+
+SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
+SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ;
+SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
+
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) private ] ;
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
+
+DEFINES += USER=1 ;
+DEFINES += DEBUG_APP="\\\"libuserlandfs_beos\\\"" ;
+DEFINES += BUILDING_USERLAND_FS_SERVER=1 ;
+
+# the library providing the BeOS kernel interface for add-ons
+SharedLibrary libuserlandfs_beos_kernel.so
+	:
+	beos_kernel_emu.cpp
+
+	beos_fs_cache.c
+	beos_lock.cpp
+	BeOSKernelFileSystem.cpp
+	BeOSKernelVolume.cpp
+
+	:
+	<nogrist>UserlandFSServer
+;

src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile

@@ -0,0 +1,37 @@
+SubDir HAIKU_TOP src add-ons kernel file_systems userlandfs server haiku ;
+
+local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel
+	file_systems userlandfs ] ;
+local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
+
+SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
+SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ;
+SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
+
+UsePrivateSystemHeaders ;
+UsePrivateHeaders libroot ;
+
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) private ] ;
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
+
+DEFINES += USER=1 ;
+DEFINES += DEBUG_APP="\\\"libuserlandfs_haiku\\\"" ;
+DEFINES += BUILDING_USERLAND_FS_SERVER=1 ;
+
+# the library providing the Haiku kernel interface for add-ons
+SharedLibrary libuserlandfs_haiku_kernel.so
+	:
+	haiku_kernel_emu.cpp
+
+	haiku_block_cache.cpp
+	haiku_condition_variable.cpp
+#	haiku_file_cache.cpp
+	haiku_hash.cpp
+	haiku_lock.cpp
+	haiku_slab.cpp
+	HaikuKernelFileSystem.cpp
+	HaikuKernelVolume.cpp
+
+	:
+	<nogrist>UserlandFSServer
+;