* Reintroduced third LinkAgainst parameter <mapLibs>, defaulting to true.

Library names are now mapped for all targets but "host" (not only for
  "haiku") -- added one more level of indirection to achieve that.
  (TARGET_LIBRARY_NAME_MAP -> *_LIBRARY_NAME_MAP_*).
* Renamed build/HaikuBuildCompatibility.h to BeOSBuildCompatibility.h
  (auto-included when compiling something that uses the Be API for platform
  "host" on anon-BeOS platform), and introduced build/HaikuBuildCompatibility.h,
  which can be included when compiling something that can be built for both,
  Haiku and BeOS compatible platforms.
* Introduced libhaikucompat.a, a library that adds a few functions existing
  under Haiku, but not under BeOS.
* New rule AddSubDirSupportedPlatforms.
* Renamed libopenbeos.so to libbe_haiku.so.
* Introduced new target platform "libbe_test", which is basically equivalent
  to a BeOS compatible host platform target, with the exception, that instead
  of the host platform's libbe.so a special build of Haiku's libbe.so
  (libbe_haiku.so (formerly known as libopenbeos.so)) is used. Furthermore
  Haiku's public app, interface, storage, and support kit headers are used
  when compiling. This replaces the less nice way in which the test app server
  and applications for this test environment were built.
  When building for platform "libbe_test", the library name "be" is
  autotranslated to "libbe_haiku.so". Thus most applications don't need
  special fiddling when them building them for the app server test environment;
  usually an "AddSubDirSupportedPlatforms libbe_test ;" will suffice.
* Reduced the dependencies of <syscalls.h> and fixed problems caused by this
  (e.g. source files not including the needed headers directly).



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

build/jam/BuildSetup

@@ -409,7 +409,7 @@ if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 		[ FDirName $(HAIKU_TOP) headers build os storage ]
 		[ FDirName $(HAIKU_TOP) headers build os support ]
 	;
-	HOST_BE_API_CCFLAGS = -include HaikuBuildCompatibility.h ;
+	HOST_BE_API_CCFLAGS = -include BeOSBuildCompatibility.h ;
 	HOST_BE_API_C++FLAGS = $(HOST_BE_API_CCFLAGS) ;
 }
 
@@ -492,6 +492,8 @@ if $(TARGET_PLATFORM) = haiku {
 
 	TARGET_BOOT_PLATFORM		= $(HAIKU_BOOT_PLATFORM) ;
 
+	TARGET_LIBRARY_NAME_MAP		= HAIKU_LIBRARY_NAME_MAP ;
+
 } else {
 	local var ;
 	for var in $(buildVars) {
@@ -504,15 +506,67 @@ if $(TARGET_PLATFORM) = haiku {
 	TARGET_GCC_LIBGCC_OBJECTS	= ;
 
 	TARGET_BOOT_PLATFORM		= ;
+
+	TARGET_LIBRARY_NAME_MAP		= ;
 }
 
 # define macro, for identifying the platform
 switch $(TARGET_PLATFORM) {
-	case r5		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_BEOS ;
+	case r5			: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_BEOS ;
-	case bone	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_BONE ;
+	case bone		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_BONE ;
-	case dano	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_DANO ;
+	case dano		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_DANO ;
-	case haiku	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_HAIKU ;
+	case haiku		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_HAIKU ;
-	case linux	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LINUX ;
+	case linux		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LINUX ;
+	case libbe_test	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LIBBE_TEST ;
+}
+
+# define macro, for identifying the host platform
+switch $(HOST_PLATFORM) {
+	case r5			: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_BEOS ;
+	case bone		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_BONE ;
+	case dano		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_DANO ;
+	case haiku		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_HAIKU ;
+	case linux		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_LINUX ;
+}
+
+
+#pragma mark -
+
+# special target libbe_test
+
+if $(TARGET_PLATFORM) = libbe_test {
+	# headers and flags
+	TARGET_HDRS += [ PublicHeaders app interface storage support ]
+		[ PrivateHeaders $(DOT) ] ;
+	local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers build
+		HaikuBuildCompatibility.h ] ;
+	TARGET_CCFLAGS += $(compatibilityHeader) ;
+	TARGET_C++FLAGS += $(compatibilityHeader) ;
+
+	# compatibility library
+	TARGET_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
+
+	# directories
+	TARGET_OBJECT_BASE_DIR
+		= [ FDirName $(HAIKU_OBJECT_DIR) $(TARGET_PLATFORM) ] ;
+	TARGET_COMMON_ARCH_OBJECT_DIR
+		= [ FDirName $(TARGET_OBJECT_BASE_DIR) common ] ;
+	TARGET_ARCH_OBJECT_DIR
+		= [ FDirName $(TARGET_OBJECT_BASE_DIR) $(TARGET_ARCH) ] ;
+	TARGET_COMMON_DEBUG_OBJECT_DIR
+		= [ FDirName $(TARGET_ARCH_OBJECT_DIR) common ] ;
+	TARGET_DEBUG_0_OBJECT_DIR
+		= [ FDirName $(TARGET_ARCH_OBJECT_DIR) release ] ;
+
+	local level ;
+	for level in $(HAIKU_DEBUG_LEVELS[2-]) {
+		TARGET_DEBUG_$(level)_OBJECT_DIR
+			= [ FDirName $(TARGET_ARCH_OBJECT_DIR) debug_$(level) ] ;
+	}
+
+	# library name map
+	TARGET_LIBRARY_NAME_MAP = LIBBE_LIBRARY_NAME_MAP ;
+	LIBBE_LIBRARY_NAME_MAP_be = libbe_haiku.so ;
 }
 
 

build/jam/HelperRules

@@ -126,6 +126,11 @@ rule SetPlatformCompatibilityFlagVariables
 		EXIT "specify it manually." ;
 	}
 
+	# special case: Haiku libbe.so built for testing under BeOS
+	if $(platform) = libbe_test {
+		platform = haiku ;
+	}
+
 	$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = ;
 	$(varPrefix)_PLATFORM_BONE_COMPATIBLE = ;
 	$(varPrefix)_PLATFORM_DANO_COMPATIBLE = ;
@@ -178,6 +183,9 @@ rule SetPlatformCompatibilityFlagVariables
 		?= $($(varPrefix)_PLATFORM_BONE_COMPATIBLE) ;
 	$(varPrefix)_PLATFORM_(r5)_COMPATIBLE
 		?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
+
+	$(varPrefix)_PLATFORM_(libbe_test)_COMPATIBLE
+		?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
 }
 
 
@@ -211,6 +219,13 @@ rule SetSubDirSupportedPlatforms
 	SUPPORTED_PLATFORMS = $(1) ;
 }
 
+rule AddSubDirSupportedPlatforms
+{
+	# AddSubDirSupportedPlatforms <platforms> ;
+
+	SUPPORTED_PLATFORMS += $(1) ;
+}
+
 rule SetSubDirSupportedPlatformsBeOSCompatible
 {
 	# SetSubDirSupportedPlatformsBeOSCompatible ;

build/jam/MainBuildRules

@@ -5,7 +5,8 @@ rule AddSharedObjectGlueCode
 	
 	# we link with -nostdlib and add the required libs manually, when building
 	# for Haiku
-	if [ on $(1) return $(PLATFORM) ] = haiku {
+	local platform = [ on $(1) return $(PLATFORM) ] ;
+	if $(platform) = haiku {
 		local stdLibs = libroot.so ;
 		local beginGlue ;
 		local endGlue ;
@@ -29,6 +30,11 @@ rule AddSharedObjectGlueCode
 		Depends $(1) : $(stdLibs) $(beginGlue) $(endGlue) ;
 		LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
 	}
+
+	# link against the compatibility libraries needed for the target
+	if $(platform) != host && $(TARGET_HAIKU_COMPATIBILITY_LIBS) {
+		LinkAgainst $(1) : $(TARGET_HAIKU_COMPATIBILITY_LIBS) ;
+	}
 }
 
 rule Executable
@@ -256,26 +262,29 @@ rule SharedLibrary
 
 rule LinkAgainst
 {
-	# LinkAgainst <name> : <libs> ;
+	# LinkAgainst <name> : <libs> [ : <mapLibs> ] ;
-	# Valid elements for <libs> are e.g. "be" or "libopenbeos.so" or
+	# Valid elements for <libs> are e.g. "be" or "libtranslation.so" or
 	# "/boot/.../libfoo.so". If the basename starts with "lib" or the thingy
 	# has a dirname or grist, it is added to the NEEDLIBS variable (i.e. the
 	# file will be bound!), otherwise it is prefixed "-l" and added to
 	# LINKLIBS. If you want to specify a target that isn't a library and
 	# also has neither grist nor a dirname, you can prepend "<nogrist>" as
 	# grist; it will be stripped by this rule.
+	# <mapLibs> specifies whether the to translate library names (e.g. "be"
+	# to "libbe.so" in case of target platform "haiku"). Defaults to "true".
 	#
 	local target = $(1) ;
 	local libs = $(2) ;
-	local mapLibs = $(3) ;
+	local mapLibs = $(3:E=true) ;
 
 	on $(target) {
 		# map libraries, if desired and target platform is Haiku
-		if $(PLATFORM)  = haiku {
+		if $(PLATFORM) != host && $(mapLibs) = true
+				&& $(TARGET_LIBRARY_NAME_MAP) {
 			local mappedLibs ;
 
 			for i in $(libs) {
-				local mapped = $(HAIKU_LIBRARY_NAME_MAP_$(i)) ;
+				local mapped = $($(TARGET_LIBRARY_NAME_MAP)_$(i)) ;
 				mapped ?= $(i) ;
 				mappedLibs += $(mapped) ;
 			}

headers/build/HaikuBuildCompatibility.h

@@ -1,51 +1,38 @@
 #ifndef HAIKU_BUILD_COMPATIBILITY_H
 #define HAIKU_BUILD_COMPATIBILITY_H
 
+#include <sys/types.h>
+
+#include <Errors.h>
+#include <string.h>
+
+// no addr_t under standard BeOS
 typedef unsigned long haiku_build_addr_t;
 #define addr_t haiku_build_addr_t
 
-#include <Errors.h>
+#ifndef DEFFILEMODE
-#include <sys/types.h>
+#define	DEFFILEMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
-#include <string.h>
+#endif
+
+#ifndef FS_WRITE_FSINFO_NAME
+#define	FS_WRITE_FSINFO_NAME	0x0001
+#endif
+
+#ifndef B_CURRENT_TEAM
+#define B_CURRENT_TEAM	0
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// Is kernel-only under Linux.
+extern size_t	strnlen(const char *string, size_t count);
+
+extern size_t	strlcat(char *dest, const char *source, size_t length);
 extern size_t   strlcpy(char *dest, const char *source, size_t length);
 
-// BeOS only
+extern char		*strcasestr(const char *string, const char *searchString);
-extern ssize_t  read_pos(int fd, off_t pos, void *buffer, size_t count);
-extern ssize_t  write_pos(int fd, off_t pos, const void *buffer,size_t count);
-
-
-// There's no O_NOTRAVERSE under Linux, but there's a O_NOFOLLOW, which
-// means something different (open() fails when the file is a symlink), but
-// we can abuse this flag for our purposes (we filter it in libroot).
-#ifndef O_NOTRAVERSE
-        #ifdef O_NOFOLLOW
-                #define O_NOTRAVERSE O_NOFOLLOW
-        #else
-                #define O_NOTRAVERSE 0
-        #endif
-#endif
-
-#ifndef S_IUMSK
-	#define S_IUMSK ALLPERMS
-#endif
-
-
-// remap strerror()
-extern char *_haiku_build_strerror(int errnum);
-
-#ifndef BUILDING_HAIKU_ERROR_MAPPER
-
-#undef strerror
-#define strerror(errnum)	_haiku_build_strerror(errnum)
-
-#endif
-
 
 #ifdef __cplusplus
 } // extern "C"

headers/private/kernel/syscalls.h

@@ -8,21 +8,29 @@
 
 #include <OS.h>
 #include <image.h>
-#include <disk_device_manager/ddm_userland_interface.h>
+#include <storage/DiskDeviceDefs.h>
 
-#include <sys/select.h>
+#include <signal.h>
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct sigaction;
-struct rlimit;
-struct stat;
-struct pollfd;
-struct fs_info;
 struct dirent;
+struct fd_set;
+struct fs_info;
+struct iovec;
+struct pollfd;
+struct rlimit;
+struct sigaction;
+struct stat;
+
+struct disk_device_job_progress_info;
+struct partitionable_space_data;
+struct user_disk_device_data;
+struct user_disk_device_job_info;
+struct user_disk_system_info;
 
 // This marks the beginning of the syscalls prototypes for gensyscallinfos.
 // NOTE:
@@ -146,7 +154,8 @@ extern status_t		_kern_unlink(int fd, const char *path);
 extern status_t		_kern_rename(int oldDir, const char *oldpath, int newDir,
 						const char *newpath);
 extern status_t		_kern_access(const char *path, int mode);
-extern ssize_t		_kern_select(int numfds, fd_set *readSet, fd_set *writeSet, fd_set *errorSet,
+extern ssize_t		_kern_select(int numfds, struct fd_set *readSet,
+						struct fd_set *writeSet, struct fd_set *errorSet,
 						bigtime_t timeout, const sigset_t *sigMask);
 extern ssize_t		_kern_poll(struct pollfd *fds, int numfds, bigtime_t timeout);
 extern int			_kern_open_attr_dir(int fd, const char *path);
@@ -165,9 +174,10 @@ extern int			_kern_open_query(dev_t device, const char *query, size_t queryLengt
 
 // file descriptor functions
 extern ssize_t		_kern_read(int fd, off_t pos, void *buffer, size_t bufferSize);
-extern ssize_t		_kern_readv(int fd, off_t pos, const iovec *vecs, size_t count);
+extern ssize_t		_kern_readv(int fd, off_t pos, const struct iovec *vecs, size_t count);
 extern ssize_t		_kern_write(int fd, off_t pos, const void *buffer, size_t bufferSize);
-extern ssize_t		_kern_writev(int fd, off_t pos, const iovec *vecs, size_t count);
+extern ssize_t		_kern_writev(int fd, off_t pos, const struct iovec *vecs,
+						size_t count);
 extern status_t		_kern_ioctl(int fd, ulong cmd, void *data, size_t length);
 extern ssize_t		_kern_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount);
 extern status_t		_kern_rewind_dir(int fd);
@@ -231,8 +241,9 @@ extern ssize_t		_kern_read_port_etc(port_id port, int32 *msgCode, void *msgBuffe
 extern status_t		_kern_set_port_owner(port_id port, team_id team);
 extern status_t		_kern_write_port_etc(port_id port, int32 msgCode, const void *msgBuffer,
 						size_t bufferSize, uint32 flags, bigtime_t timeout);
-extern status_t		_kern_writev_port_etc(port_id id, int32 msgCode, const iovec *msgVecs,
+extern status_t		_kern_writev_port_etc(port_id id, int32 msgCode,
-						size_t vecCount, size_t bufferSize, uint32 flags, bigtime_t timeout);
+						const struct iovec *msgVecs, size_t vecCount,
+						size_t bufferSize, uint32 flags, bigtime_t timeout);
 
 // debug support functions
 extern void			_kern_debugger(const char *message);
@@ -297,7 +308,7 @@ extern partition_id	_kern_get_next_disk_device_id(int32 *cookie, size_t *neededS
 extern partition_id	_kern_find_disk_device(const char *filename, size_t *neededSize);
 extern partition_id	_kern_find_partition(const char *filename, size_t *neededSize);
 extern status_t		_kern_get_disk_device_data(partition_id deviceID, bool deviceOnly,
-						bool shadow, user_disk_device_data *buffer,
+						bool shadow, struct user_disk_device_data *buffer,
 						size_t bufferSize, size_t *neededSize);
 extern partition_id	_kern_register_file_device(const char *filename);
 extern status_t		_kern_unregister_file_device(partition_id deviceID,
@@ -307,10 +318,11 @@ extern status_t		_kern_unregister_file_device(partition_id deviceID,
 
 // disk systems
 extern status_t		_kern_get_disk_system_info(disk_system_id id,
-						user_disk_system_info *info);
+						struct user_disk_system_info *info);
 extern status_t		_kern_get_next_disk_system_info(int32 *cookie,
-						user_disk_system_info *info);
+						struct user_disk_system_info *info);
-extern status_t		_kern_find_disk_system(const char *name, user_disk_system_info *info);
+extern status_t		_kern_find_disk_system(const char *name,
+						struct user_disk_system_info *info);
 extern bool			_kern_supports_defragmenting_partition(partition_id partitionID,
 						int32 changeCounter, bool *whileMounted);
 extern bool			_kern_supports_repairing_partition(partition_id partitionID,
@@ -357,8 +369,9 @@ extern status_t		_kern_validate_create_child_partition(partition_id partitionID,
 						const char *type, const char *parameters,
 						size_t parametersSize);
 extern status_t		_kern_get_partitionable_spaces(partition_id partitionID,
-						int32 changeCounter, partitionable_space_data *buffer,
+						int32 changeCounter,
-						int32 count, int32 *actualCount);
+						struct partitionable_space_data *buffer, int32 count,
+						int32 *actualCount);
 extern status_t		_kern_get_next_supported_partition_type(partition_id partitionID,
 						int32 changeCounter, int32 *cookie, char *type);
 extern status_t		_kern_get_partition_type_for_content_type(disk_system_id diskSystemID,
@@ -404,11 +417,11 @@ extern status_t		_kern_delete_partition(partition_id partitionID, int32 changeCo
 
 // jobs
 extern status_t		_kern_get_next_disk_device_job_info(int32 *cookie,
-						user_disk_device_job_info *info);
+						struct user_disk_device_job_info *info);
 extern status_t		_kern_get_disk_device_job_info(disk_job_id id,
-						user_disk_device_job_info *info);
+						struct user_disk_device_job_info *info);
 extern status_t		_kern_get_disk_device_job_progress_info(disk_job_id id,
-						disk_device_job_progress_info *info);
+						struct disk_device_job_progress_info *info);
 extern status_t		_kern_pause_disk_device_job(disk_job_id id);
 extern status_t		_kern_cancel_disk_device_job(disk_job_id id, bool reverse);
 

src/add-ons/decorators/BeDecorator/Jamfile

@@ -7,5 +7,5 @@ UsePrivateHeaders [ FDirName servers app ] ;
 Addon BeDecorator : decorators :
 	BeDecorator.cpp
 	: false
-	: be libopenbeos.so libappserver.so
+	: be libappserver.so
 ;

src/add-ons/decorators/MacDecorator/Jamfile

@@ -7,5 +7,5 @@ UsePrivateHeaders [ FDirName servers app ] ;
 Addon MacDecorator : decorators :
 	MacDecorator.cpp
 	: false
-	: be libopenbeos.so libappserver.so
+	: be libappserver.so
 ;

src/add-ons/decorators/WinDecorator/Jamfile

@@ -7,5 +7,5 @@ UsePrivateHeaders [ FDirName servers app ] ;
 Addon WinDecorator : decorators :
 	WinDecorator.cpp
 	: false
-	: be libopenbeos.so libappserver.so
+	: be libappserver.so
 ;

src/add-ons/input_server/devices/serial_mouse/Jamfile

@@ -10,11 +10,6 @@ Addon <input>serial_mouse : input_server/devices :
 	: false 
 	: be device <nogrist>input_server ;
 
-if $(COMPILE_FOR_R5) {
-} else {
-        LinkAgainst <input>mouse : <boot!home!config!lib>libopenbeos.so ;
-}
-
 Package haiku-inputkit-cvs :
         <input>serial_mouse :
         boot home config add-ons input_server devices ;

src/build/Jamfile

@@ -1,5 +1,6 @@
 SubDir HAIKU_TOP src build ;
 
 SubInclude HAIKU_TOP src build libbe ;
+SubInclude HAIKU_TOP src build libhaikucompat ;
 SubInclude HAIKU_TOP src build libroot ;
 

src/build/libhaikucompat/Jamfile

@@ -0,0 +1,13 @@
+SubDir HAIKU_TOP src build libhaikucompat ;
+
+SetSubDirSupportedPlatforms libbe_test ;
+
+StaticLibrary libhaikucompat.a :
+	strcasestr.c
+	strlcat.c
+	strlcpy.c
+	strnlen.c
+;
+
+SEARCH on [ FGristFiles strcasestr.c strlcat.c strlcpy.c strnlen.c ]
+	= [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;

src/kits/Jamfile

@@ -37,22 +37,25 @@ SharedLibrary libbe.so :
 	$(TARGET_LIBSTDC++)
 ;
 
-# Build libopenbeos.so
+# Build libbe_haiku.so
 
-SetSupportedPlatformsForTarget libopenbeos.so : r5 bone dano ;
+SetSupportedPlatformsForTarget libbe_haiku.so : libbe_test ;
-
-if $(TARGET_PLATFORM) != haiku {
-	UseHeaders [ FStandardOSHeaders ] : true ;
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() only.
 
+if $(TARGET_PLATFORM) = libbe_test {
+	local syslog = [ FGristFiles syslog.o ] ;
 	# Remove _NO_INLINE_ASM from the defines for syslog.cpp. Otherwise we get
 	# references to tls_get/set() etc. that don't exist under BeOS.
-	TARGET_DEFINES on [ FGristFiles syslog.o ]
+	TARGET_DEFINES on $(syslog)
-		= [ FFilter $(TARGET_DEFINES) : _NO_INLINE_ASM ] ;
+		= [ on $(syslog) FFilter $(TARGET_DEFINES) : _NO_INLINE_ASM ] ;
+
+	# We need to use our <syslog.h>, because the syslog() prototype differs
+	# from the BeOS one.
+	TARGET_DEFINES on $(syslog) += _SYS_LOG_H ;
+	TARGET_C++FLAGS on $(syslog) = [ on $(syslog) return $(TARGET_C++FLAGS) ]
+		-include [ FDirName $(HAIKU_TOP) headers posix syslog.h ] ;
 }
 
-SharedLibrary libopenbeos.so :
+SharedLibrary libbe_haiku.so :
 	KMessage.cpp
 	syslog.cpp
 	:
@@ -63,7 +66,7 @@ SharedLibrary libopenbeos.so :
 
 	libbeadapter.so
 	net
-	stdc++.r4
+	$(TARGET_LIBSTDC++)
 ;
 
 SEARCH on [ FGristFiles KMessage.cpp ]

src/kits/app/Jamfile

@@ -20,12 +20,7 @@ if $(RUN_WITHOUT_APP_SERVER) != 0 {
 UsePrivateHeaders shared app interface ;
 UsePrivateHeaders [ FDirName kernel util ] ;   # For KMessage.h
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
+SetSubDirSupportedPlatforms haiku libbe_test ;
-if $(TARGET_PLATFORM) != haiku {
-	UseHeaders [ FStandardOSHeaders ] : true ;
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() only.
-}
 
 MergeObject <libbe>app_kit.o :
 	AppDefs.cpp

src/kits/interface/Jamfile

@@ -23,13 +23,7 @@ if ! $(HAIKU_COMPATIBLE) {
 	SubDirC++Flags $(defines) ;
 }
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
+SetSubDirSupportedPlatforms haiku libbe_test ;
-if $(TARGET_PLATFORM) != haiku {
-	UseHeaders [ FStandardOSHeaders ] : true ;
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() only.
-}
-
 
 UsePrivateHeaders shared app interface input [ FDirName servers app ] ;
 

src/kits/storage/DiskDevice.cpp

@@ -14,14 +14,15 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <syscalls.h>
-
 #include <DiskDevice.h>
 #include <DiskDeviceVisitor.h>
 #include <Drivers.h>
 #include <Message.h>
 #include <Path.h>
 
+#include <syscalls.h>
+#include <disk_device_manager/ddm_userland_interface.h>
+
 
 /*!	\class BDiskDevice
 	\brief A BDiskDevice object represents a storage device.

src/kits/storage/DiskDeviceJob.cpp

@@ -3,10 +3,11 @@
 //  by the OpenBeOS license.
 //---------------------------------------------------------------------
 
-#include <syscalls.h>
-
 #include <DiskDeviceJob.h>
 
+#include <syscalls.h>
+#include <disk_device_manager/ddm_userland_interface.h>
+
 // constructor
 BDiskDeviceJob::BDiskDeviceJob()
 	: fID(B_NO_INIT),

src/kits/storage/DiskDeviceRoster.cpp

@@ -5,8 +5,6 @@
 
 #include <new>
 
-#include <syscalls.h>
-
 #include <Directory.h>
 #include <DiskDevice.h>
 #include <DiskDeviceJob.h>
@@ -19,6 +17,9 @@
 #include <Partition.h>
 #include <Path.h>
 
+#include <syscalls.h>
+#include <disk_device_manager/ddm_userland_interface.h>
+
 //#include "AddOnImage.h"
 
 /*!	\class BDiskDeviceRoster

src/kits/storage/DiskSystem.cpp

@@ -3,11 +3,12 @@
 //  by the OpenBeOS license.
 //---------------------------------------------------------------------
 
-#include <syscalls.h>
-
 #include <DiskSystem.h>
 #include <Partition.h>
 
+#include <syscalls.h>
+#include <disk_device_manager/ddm_userland_interface.h>
+
 // constructor
 BDiskSystem::BDiskSystem()
 	: fID(B_NO_INIT),

src/kits/storage/File.cpp

@@ -8,6 +8,7 @@
 */
 
 #include <fcntl.h>
+#include <unistd.h>
 
 #include <Directory.h>
 #include <Entry.h>

src/kits/storage/Jamfile

@@ -1,13 +1,6 @@
 SubDir HAIKU_TOP src kits storage ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
+SetSubDirSupportedPlatforms haiku libbe_test ;
-if $(TARGET_PLATFORM) != haiku {
-	UseHeaders [ FStandardOSHeaders ] : true ;
-	UsePrivateHeaders $(DOT) ;
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() and
-		# sys/select.h only.
-}
 
 UsePrivateHeaders shared app kernel storage ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -68,7 +61,7 @@ MergeObject <libbe>storage_kit.o :
 	Rule.cpp
 ;
 
-# We need to keep the DiskDevice API out of libopenbeos as long as the
+# We need to keep the DiskDevice API out of libbe_haiku as long as the
 # Interface Kit is not fully functional (at least the part we are using).
 # So, we build it separately.
 
@@ -90,13 +83,5 @@ MergeObject <libbe>storage_diskdevice_kit.o :
 
 SharedLibrary libbeadapter.so :
 	LibBeAdapter.cpp
-	strlcat.c
-	strlcpy.c
-	strcasestr.c
-
-	: be
 ;
-
+LinkAgainst libbeadapter.so : be : false ;
-SEARCH on [ FGristFiles
-		strlcat.c strlcpy.c strcasestr.c
-	] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;

src/kits/storage/Partition.cpp

@@ -8,8 +8,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <syscalls.h>
-
 #include <Directory.h>
 #include <DiskDevice.h>
 #include <DiskDevicePrivate.h>
@@ -23,6 +21,9 @@
 #include <String.h>
 #include <Volume.h>
 
+#include <syscalls.h>
+#include <disk_device_manager/ddm_userland_interface.h>
+
 /*!	\class BPartition
 	\brief A BPartition object represent a partition and provides a lot of
 		   methods to retrieve information about it and some to manipulate it.

src/kits/storage/PartitioningInfo.cpp

@@ -5,10 +5,11 @@
 
 #include <new>
 
-#include <syscalls.h>
-
 #include <PartitioningInfo.h>
 
+#include <syscalls.h>
+#include <disk_device_manager/ddm_userland_interface.h>
+
 using namespace std;
 
 // constructor

src/kits/storage/Volume.cpp

@@ -17,7 +17,6 @@
 #include <Bitmap.h>
 #include <Directory.h>
 #include <fs_info.h>
-#include <fs_interface.h>
 #include <Node.h>
 #include <Path.h>
 #include <Volume.h>
@@ -25,6 +24,10 @@
 #include <storage_support.h>
 #include <syscalls.h>
 
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#include <fs_interface.h>
+#endif
+
 #ifdef USE_OPENBEOS_NAMESPACE
 namespace OpenBeOS {
 #endif

src/kits/support/Jamfile

@@ -1,12 +1,12 @@
 SubDir HAIKU_TOP src kits support ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
+SetSubDirSupportedPlatforms haiku libbe_test ;
-if $(TARGET_PLATFORM) != haiku {
+#if $(TARGET_PLATFORM) != haiku {
-	UseHeaders [ FStandardOSHeaders ] : true ;
+#	UseHeaders [ FStandardOSHeaders ] : true ;
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
+#	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() and
+#		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() and
-		# addr_t.
+#		# addr_t.
-}
+#}
 
 UsePrivateHeaders shared app ;
 

src/kits/textencoding/Jamfile

@@ -1,6 +1,8 @@
 SubDir HAIKU_TOP src kits textencoding ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
 UsePrivateHeaders textencoding ;
 SubDirSysHdrs [ FDirName $(SUBDIR) libiconv ] ;
 

src/kits/textencoding/libiconv/Jamfile

@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src kits textencoding libiconv ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 # disable warnings we don't want here
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)

src/libs/agg/Jamfile

@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src libs agg ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 UseLibraryHeaders agg ;

src/libs/freetype2/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 # The file <freetype/internal/internal.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to

src/libs/freetype2/autofit/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 autofit ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/autohint/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 autohint ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/base/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 base ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/bdf/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 bdf ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/cache/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 cache ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/cff/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 cff ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/cid/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 cid ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/gzip/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 gzip ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/lzw/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 lzw ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/otvalid/Jamfile

@@ -12,6 +12,7 @@
 SubDir  HAIKU_TOP src libs freetype2 otvalid ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/pcf/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 pcf ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/pfr/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 pfr ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/psaux/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 psaux ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/pshinter/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 pshinter ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/psnames/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 psnames ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/raster/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 raster ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/sfnt/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 sfnt ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/smooth/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 smooth ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/truetype/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 truetype ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/type1/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 type1 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/type42/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 type42 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/freetype2/winfonts/Jamfile

@@ -4,6 +4,7 @@
 SubDir  HAIKU_TOP src libs freetype2 winfonts ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseFreeTypeHeaders ;
 

src/libs/png/Jamfile

@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src libs png ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseLibraryHeaders zlib ;
 

src/preferences/appearance/Jamfile

@@ -19,7 +19,7 @@ Preference Appearance :
 	#FontMenu.cpp
 	#MenuView.cpp
 	
-	: libbe.so libopenbeos.so libtranslation.so libappserver.so
+	: be libtranslation.so libappserver.so
 	: Appearance.rdef
 	;
 

src/servers/app/drawing/Painter/Jamfile

@@ -1,9 +1,7 @@
 SubDir HAIKU_TOP src servers app drawing Painter ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
-if $(TARGET_PLATFORM) != haiku {
+AddSubDirSupportedPlatforms libbe_test ;
-	UseHeaders [ FStandardOSHeaders ] : true ;
-}
 
 UseLibraryHeaders agg ;
 UsePrivateHeaders app interface shared [ FDirName servers app ] ;

src/servers/input/Jamfile

@@ -74,27 +74,9 @@ Server input_server :
 	AddOnMonitorHandler.cpp
 	NodeMonitorHandler.cpp
 
-	: $(TARGET_LIBSTDC++)
+	: be $(TARGET_LIBSTDC++)
 ;
 
-if $(TARGET_PLATFORM) = haiku {
-        # link for Haiku
-
-        LinkAgainst input_server :
-                libroot.so libbe.so ;
-
-} else {
-        # link as test application under R5
-
-        LinkAgainst input_server :
-                be ;
-	if $(APPSERVER_TEST_MODE) {
-		LinkAgainst input_server :
-                <boot!home!config!lib>libopenbeos.so ;
-	}
-}
-
-
 SEARCH on [ FGristFiles AddOnMonitor.cpp
 	AddOnMonitorHandler.cpp
 	NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;

src/system/libroot/posix/unistd/alarm.c

@@ -4,9 +4,11 @@
 */
 
 
-#include <unistd.h>
-#include <syscalls.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include <syscalls.h>
 
 
 uint

src/system/libroot/posix/unistd/ualarm.c

@@ -4,9 +4,11 @@
 */
 
 
-#include <unistd.h>
-#include <syscalls.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include <syscalls.h>
 
 
 uint

src/tests/apps/miniterminal/Jamfile

@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src tests apps miniterminal ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src tests apps miniterminal ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ;
@@ -14,13 +15,10 @@ Application MiniTerminal :
 	MiniView.cpp 
 	MiniWin.cpp
 	ViewBuffer.cpp
-	;
+	: be
-
+;
-if $(TARGET_PLATFORM) = haiku {
-	LinkAgainst MiniTerminal : be ;
-} else {
-	LinkAgainst MiniTerminal : libopenbeos.so ;
 
+if $(TARGET_PLATFORM) = libbe_test {
 	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : MiniTerminal
 		: tests!apps ;
 }

src/tests/kits/app/Jamfile

@@ -25,7 +25,7 @@ CommonTestLib libmessagetest.so
 		MessageOpAssignTest.cpp
 		MessageEasyFindTest.cpp
 		MessageSpeedTest.cpp
-	: <boot!home!config!lib>libopenbeos.so stdc++.r4
+	: be stdc++.r4
 	: be stdc++.r4
 	: 
 	: app
@@ -151,8 +151,7 @@ CommonTestLib libapptest.so
 		AppRunner.cpp
 		PipedAppRunner.cpp
 
-	: <boot!home!config!lib>libopenbeos.so
+	: be stdc++.r4
-		be stdc++.r4
 	: be stdc++.r4
 	: 
 	: app support

src/tests/kits/app/bapplication/testapps/Jamfile

@@ -37,7 +37,7 @@ rule SimpleBAppTestApp2
 	CommonUnitTest $(name)
 		: $(sources)
 		: kits app
-		: <boot!home!config!lib>libopenbeos.so be stdc++.r4 $(useObjects)
+		: be stdc++.r4 $(useObjects)
 		: be stdc++.r4 $(useR5Objects)
 		: app support
 	;

src/tests/kits/app/bmessenger/Jamfile

@@ -4,7 +4,7 @@ CommonUnitTest SMRemoteTargetApp
 	: SMRemoteTargetApp.cpp
 	  SMLooper.cpp
 	: kits app
-	: <boot!home!config!lib>libopenbeos.so be stdc++.r4
+	: be stdc++.r4
 	: be stdc++.r4
 	: app support
 ;

src/tests/kits/app/bmessenger/testapps/Jamfile

@@ -38,7 +38,7 @@ rule SimpleBMessengerTestApp2
 	CommonUnitTest $(name)
 		: $(sources)
 		: kits app
-		: <boot!home!config!lib>libopenbeos.so be stdc++.r4 $(useObjects)
+		: be stdc++.r4 $(useObjects)
 		: be stdc++.r4 $(useR5Objects)
 		: app support
 	;

src/tests/kits/app/broster/testapps/Jamfile

@@ -40,7 +40,7 @@ rule SimpleBRosterTestApp2
 	CommonUnitTest $(name)
 		: $(sources)
 		: kits app
-		: <boot!home!config!lib>libopenbeos.so be stdc++.r4 $(useObjects)
+		: be stdc++.r4 $(useObjects)
 		: be stdc++.r4 $(useR5Objects)
 		: app support
 	;

src/tests/kits/interface/Jamfile

@@ -50,8 +50,7 @@ CommonTestLib libinterfacetest.so
 		WidthBufferTest.cpp
 		WidthBufferSimpleTest.cpp
 
-	: <boot!home!config!lib>libopenbeos.so
+	: be stdc++.r4
-		be stdc++.r4
 	: be stdc++.r4
 	: 
 	: app support

src/tests/kits/storage/Jamfile

@@ -22,7 +22,7 @@ CommonTestLib libstoragetest.so
 		SymLinkTest.cpp
 		TestApp.cpp
 		VolumeTest.cpp
-	: <boot!home!config!lib>libopenbeos.so be stdc++.r4
+	: be stdc++.r4
 	: be stdc++.r4
 	:
 	: storage

src/tests/kits/storage/disk_device/Jamfile

@@ -9,7 +9,7 @@ UsePrivateHeaders storage ;
 SimpleTest DiskDeviceTest
 	: DiskDeviceTest.cpp
 
-	  # We compile these classes in. If we would link against libopenbeos
+	  # We compile these classes in. If we would link against libbe_haiku
 	  # instead, we couldn't use any GUI. At least not at this time.
 	  #
 #	  Mime.cpp

src/tests/kits/support/Jamfile

@@ -74,8 +74,7 @@ CommonTestLib libsupporttest.so
 		BlockCacheExerciseTest.cpp
 		BlockCacheConcurrencyTest.cpp
 
-	: <boot!home!config!lib>libopenbeos.so
+	: be stdc++.r4
-		be stdc++.r4
 	: be stdc++.r4
 	: libsupporttest_RemoteTestObject.so
 	: support

src/tests/kits/support/barchivable/remoteobjectdef/Jamfile

@@ -7,7 +7,7 @@ AddResources libsupporttest_RemoteTestObject_r5.so : RemoteTestObject.rdef ;
 
 CommonTestLib libsupporttest_RemoteTestObject.so
 	: RemoteTestObject.cpp
-	: <boot!home!config!lib>libopenbeos.so be stdc++.r4
+	: be stdc++.r4
 	: be stdc++.r4
 	:
 	: support

src/tests/servers/app/Jamfile

@@ -1,15 +1,9 @@
 SubDir HAIKU_TOP src tests servers app ;
 
-SetSubDirSupportedPlatforms r5 bone ;
+SetSubDirSupportedPlatforms libbe_test ;
 
-UseHeaders [ FStandardOSHeaders ] : true ;
+# No need to define any of those targets, when not building for libbe_test
-UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
+if $(TARGET_PLATFORM) = libbe_test {
-	# TODO: POSIX headers shouldn't be used. Needed for strlcpy() and addr_t.
-
-# Remove _NO_INLINE_ASM from the defines for syslog.cpp. Otherwise we get
-# references to tls_get/set() etc. that don't exist under BeOS.
-#TARGET_DEFINES on [ FGristFiles syslog.o ]
-#	= [ FFilter $(TARGET_DEFINES) : _NO_INLINE_ASM ] ;
 
 UseLibraryHeaders agg png zlib ;
 UsePrivateHeaders app interface shared [ FDirName servers app ] ;
@@ -24,15 +18,12 @@ UseFreeTypeHeaders ;
 
 SEARCH_SOURCE += $(appServerDir) [ FDirName $(appServerDir) drawing ] ;
 
-# No need to define any of those targets, when building for haiku
-if $(TARGET_PLATFORM) != haiku {
-
 SharedLibrary libhwinterface.so :
 	BBitmapBuffer.cpp
 	HWInterface.cpp
 	MultiLocker.cpp
 
-	: libhaikuappserver.so libopenbeos.so
+	: libhaikuappserver.so be
 ;
 
 
@@ -46,7 +37,7 @@ SharedLibrary libhwinterfaceimpl.so :
 	fake_input_server.cpp
 	ViewHWInterface.cpp
 
-	: libopenbeos.so libhwinterface.so
+	: be libhwinterface.so
 ;
 
 SharedLibrary libhaikuappserver.so :
@@ -74,7 +65,7 @@ SharedLibrary libhaikuappserver.so :
 
 	# libraries
 	:
-	libopenbeos.so libtextencoding.so libfreetype.so
+	be libtextencoding.so libfreetype.so
 ;
 
 AddResources haiku_app_server : app_server.rdef ;
@@ -124,21 +115,21 @@ Server haiku_app_server :
 	# libraries
 	:
 	z libpng.so libhaikuappserver.so
-	libpainter.a libopenbeos.so 
+	libpainter.a be 
 	libhwinterface.so libhwinterfaceimpl.so
 	libagg.a libfreetype.so libtextencoding.so
 ;
 
 # install in the test dir
 HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR)
-	: libpng.so libhaikuappserver.so libopenbeos.so libhwinterface.so
+	: libpng.so libhaikuappserver.so libbe_haiku.so libhwinterface.so
 	  libhwinterfaceimpl.so libfreetype.so libtextencoding.so
 	: tests!apps ;
 
 HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : haiku_app_server
 	: tests!apps ;
 
-} # if $(TARGET_PLATFORM) != haiku
+} # if $(TARGET_PLATFORM) = libbe_test
 
 SubInclude HAIKU_TOP src tests servers app bitmap_drawing ;
 SubInclude HAIKU_TOP src tests servers app copy_bits ;

src/tests/servers/app/bitmap_drawing/Jamfile

@@ -1,20 +1,13 @@
 SubDir HAIKU_TOP src tests servers app bitmap_drawing ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
 UseHeaders [ FDirName os app ] ;
 UseHeaders [ FDirName os interface ] ;
 
 Application BitmapDrawing :
 	main.cpp
-	;
+	: be
-
+;
-if ( $(TARGET_PLATFORM) = haiku ) {
-	# for running natively under R5 or Haiku:
-	LinkAgainst BitmapDrawing :
-		libbe.so ;
-} else {
-	# for running in the Haiku app_server under R5:
-	LinkAgainst BitmapDrawing :
-		<boot!home!config!lib>libopenbeos.so ;
-#		be ;
-}
 

src/tests/servers/app/copy_bits/Jamfile

@@ -1,12 +1,12 @@
 SubDir HAIKU_TOP src tests servers app copy_bits ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
 UseHeaders [ FDirName os app ] ;
 UseHeaders [ FDirName os interface ] ;
 
 SimpleTest CopyBits :
 	main.cpp
-# for running in the Haiku app_server under R5:
+	: be ;
-#	: <boot!home!config!lib>libopenbeos.so ;
-# for running natively under R5 or Haiku:
-	: libbe.so ;
 

src/tests/servers/app/playground/Jamfile

@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src tests servers app playground ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseHeaders [ FDirName os app ] ;
 UseHeaders [ FDirName os interface ] ;
@@ -10,15 +11,10 @@ Application Playground :
 	ObjectView.cpp
 	ObjectWindow.cpp
 	States.cpp
+	: be
 ;
 
-if ( $(TARGET_PLATFORM) = haiku ) {
+if ( $(TARGET_PLATFORM) = libbe_test ) {
-	# for running natively under R5 or Haiku:
-	LinkAgainst Playground : be ;
-} else {
-	# for running in the Haiku app_server under R5:
-	LinkAgainst Playground : libopenbeos.so ;
-
 	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Playground
 		: tests!apps ;
 }

src/tests/servers/app/regularapps/Jamfile

@@ -7,15 +7,17 @@ UseHeaders [ FDirName $(clockDir) ] ;
 SEARCH_SOURCE += $(clockDir) [ FDirName $(clockDir) ] ;
 
 # No need to define any of those targets, when building for haiku
-if $(TARGET_PLATFORM) != haiku {
+if $(TARGET_PLATFORM) = libbe_test {
+
+SetSubDirSupportedPlatforms libbe_test ;
 
 SimpleTest TestApp_Clock :
 	cl_view.cpp
 	cl_wind.cpp 
 	clock.cpp
-	: libopenbeos.so
+	: be
 	: Clock.rdef
 	;
 
 
-} # if $(TARGET_PLATFORM) != haiku
+} # if $(TARGET_PLATFORM) = libbe_test

src/tests/servers/app/resize_limits/Jamfile

@@ -1,16 +1,9 @@
 SubDir HAIKU_TOP src tests servers app resize_limits ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
 Application ResizeLimits :
 	ResizeLimits.cpp
-	;
+	: be
-
+;
-if ( $(TARGET_PLATFORM) = haiku ) {
-	# for running natively under R5 or Haiku:
-	LinkAgainst ResizeLimits :
-		libbe.so ;
-} else {
-	# for running in the Haiku app_server under R5:
-	LinkAgainst ResizeLimits :
-		<boot!home!config!lib>libopenbeos.so ;
-}
-

src/tests/servers/app/scrolling/Jamfile

@@ -1,12 +1,12 @@
 SubDir HAIKU_TOP src tests servers app scrolling ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
 UseHeaders [ FDirName os app ] ;
 UseHeaders [ FDirName os interface ] ;
 
 SimpleTest Scrolling :
 	main.cpp
-# for running in the Haiku app_server under R5:
+	: be ;
-#	: <boot!home!config!lib>libopenbeos.so ;
-# for running natively under R5 or Haiku:
-	: libbe.so ;
 

src/tests/servers/app/textview/Jamfile

@@ -1,12 +1,12 @@
 SubDir HAIKU_TOP src tests servers app textview ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
 UseHeaders [ FDirName os app ] ;
 UseHeaders [ FDirName os interface ] ;
 
 SimpleTest TextView :
 	main.cpp
-# for running in the Haiku app_server under R5:
+	: be ;
-#	: <boot!home!config!lib>libopenbeos.so ;
-# for running natively under R5 or Haiku:
-	: libbe.so ;
 

src/tests/servers/app/view_state/Jamfile

@@ -1,21 +1,17 @@
 SubDir HAIKU_TOP src tests servers app view_state ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
 
 UseHeaders [ FDirName os app ] ;
 UseHeaders [ FDirName os interface ] ;
 
 Application ViewState :
 	ViewState.cpp
+	: be
 ;
 
-if ( $(TARGET_PLATFORM) = haiku ) {
+if $(TARGET_PLATFORM) = libbe_test {
-	# for running natively under R5 or Haiku:
-	LinkAgainst ViewState : be ;
-} else {
-	# for running in the Haiku app_server under R5:
-	LinkAgainst ViewState : libopenbeos.so ;
-
 	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : ViewState
 		: tests!apps ;
 }

src/tests/servers/input/prefs/Jamfile

@@ -22,11 +22,6 @@ SimpleTest KeymapTest :
 	Input.cpp
 	: be tracker ;
 
-if $(COMPILE_FOR_R5) {
-} else {
-	LinkAgainst KeymapTest : <boot!home!config!lib>libopenbeos.so ;
-}
-
 SEARCH on [ FGristFiles
 	KeymapApplication.cpp
 	KeymapWindow.cpp
@@ -48,11 +43,6 @@ SimpleTest KeyboardTest :
 	Input.cpp
 	: translation be ;
 
-if $(COMPILE_FOR_R5) {
-} else {
-	LinkAgainst KeyboardTest : <boot!home!config!lib>libopenbeos.so ;
-}
-
 SEARCH on [ FGristFiles
 	Keyboard.cpp 
 	KeyboardSettings.cpp 
@@ -75,11 +65,6 @@ SimpleTest MouseTest :
 	: translation be
 	;
 
-if $(COMPILE_FOR_R5) {
-} else {
-	LinkAgainst MouseTest : <boot!home!config!lib>libopenbeos.so ;
-}
-
 SEARCH on [ FGristFiles
 	Mouse.cpp 
 	MouseSettings.cpp 
@@ -98,11 +83,6 @@ SimpleTest keymapTest :
 	Input.cpp
 	: be ;
 
-if $(COMPILE_FOR_R5) {
-} else {
-	LinkAgainst keymapTest : <boot!home!config!lib>libopenbeos.so ;
-}
-
 SEARCH on [ FGristFiles
 	main.cpp
 	Keymap.cpp

src/tests/servers/input/view_input_device/Jamfile

@@ -1,6 +1,8 @@
 SubDir HAIKU_TOP src tests servers input view_input_device ;
 
+SetSubDirSupportedPlatforms libbe_test ;
+
 Addon ViewInputDevice : input_server devices : ViewInputDevice.cpp ;
-LinkAgainst ViewInputDevice : be <nogrist>input_server <boot!home!config!lib>libopenbeos.so ;
+LinkAgainst ViewInputDevice : be <nogrist>input_server be ;
 
 MakeLocate ViewInputDevice : [ FDirName $(HAIKU_TEST_DIR) servers input view_input_device input_server devices ] ;

src/tests/servers/registrar/Jamfile

@@ -1,24 +1,18 @@
 SubDir HAIKU_TOP src tests servers registrar ;
 
-local libbe ;
+SetSubDirSupportedPlatforms libbe_test ;
-if $(TARGET_PLATFORM) = r5 {
-	libbe = libopenbeos.so ;
-} else {
-	libbe = be ;
-}
 
 SimpleTest RegistrarTest1
 	: RegistrarTest1.cpp
-	: <boot!home!config!lib>libopenbeos.so be
+	: be
 ;
 
 SimpleTest RosterShell
 	: RosterShell.cpp
-	: $(libbe) stdc++.r4
+	: be stdc++.r4
 ;
 
-SimpleTest message_deliverer_test : message_deliverer_test.cpp
+SimpleTest message_deliverer_test : message_deliverer_test.cpp : be ;
-	: <boot!home!config!lib>libopenbeos.so ;
 
 
 SimpleTest run_haiku_registrar
@@ -27,47 +21,35 @@ SimpleTest run_haiku_registrar
 ;
 
 # a shutdown working with the emulation under R5
-if $(TARGET_PLATFORM) = r5 {
+UsePrivateHeaders app ;
-	UsePrivateHeaders app ;
+UsePrivateHeaders kernel ;
-	UsePrivateHeaders kernel ;
 
-	SimpleTest <test>shutdown
+SimpleTest <test>shutdown
-		: shutdown.cpp
+	: shutdown.cpp
-		: <boot!home!config!lib>libopenbeos.so ;
+	: be ;
-	
+
-	SEARCH on [ FGristFiles shutdown.cpp ] = [ FDirName $(HAIKU_TOP) src bin ] ;
+SEARCH on [ FGristFiles shutdown.cpp ] = [ FDirName $(HAIKU_TOP) src bin ] ;
-}
 
 # Two small test apps for testing the shutdown process.
 
 SimpleTest no_shutdown_reply
 	: no_shutdown_reply.cpp
-	: $(libbe)
+	: be
 ;
 
 SimpleTest negative_shutdown_reply
 	: negative_shutdown_reply.cpp
-	: $(libbe)
+	: be
 ;
 
 SimpleTest user_shutdown_reply
 	: user_shutdown_reply.cpp
-	: $(libbe)
+	: be
 ;
 
 
 # the registrar itself
 
-SetSupportedPlatformsForTarget haiku_registrar : r5 bone dano ;
-
-if $(TARGET_PLATFORM) != haiku {
-	UseHeaders [ FStandardOSHeaders ] : true ;
-	UsePrivateHeaders $(DOT) ;
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() and
-		# <sys/select.h>.
-}
-
 UsePrivateHeaders app ;
 UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
@@ -104,13 +86,13 @@ Server haiku_registrar
 
 	R5Compatibility.cpp
 	:
-	libopenbeos.so
+	be
-	stdc++.r4
+	$(TARGET_LIBSTDC++)
 	:
 	registrar.rdef
 ;
 
-if $(TARGET_PLATFORM) != haiku {
+if $(TARGET_PLATFORM) = libbe_test {
 	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : haiku_registrar
 		: tests!apps ;
 }