From b9f23a349749d636cc466430590a71d3ac5bc3c2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 16 Apr 2008 17:55:55 +0000 Subject: [PATCH] Moved KMessage from libbe to libroot. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24984 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/Jamfile | 6 ------ src/system/libroot/os/Jamfile | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/kits/Jamfile b/src/kits/Jamfile index 9a46a337c7..ef64d98401 100644 --- a/src/kits/Jamfile +++ b/src/kits/Jamfile @@ -17,7 +17,6 @@ if $(RUN_WITHOUT_APP_SERVER) != 0 { SubDirC++Flags $(defines) ; } -UsePrivateHeaders [ FDirName kernel ] # For KMessage.h UsePrivateHeaders syslog_daemon ; # For syslog.cpp # Build our libbe.so @@ -25,7 +24,6 @@ UsePrivateHeaders syslog_daemon ; # For syslog.cpp AddResources libbe.so : libbe_version.rdef ; SharedLibrary libbe.so : - KMessage.cpp : app_kit.o interface_kit.o @@ -58,7 +56,6 @@ if $(TARGET_PLATFORM) = libbe_test { } SharedLibrary libbe_haiku.so : - KMessage.cpp syslog.cpp : app_kit.o @@ -74,9 +71,6 @@ SharedLibrary libbe_haiku.so : $(TARGET_LIBSTDC++) ; -SEARCH on [ FGristFiles KMessage.cpp ] - = [ FDirName $(HAIKU_TOP) src system kernel messaging ] ; - SEARCH on [ FGristFiles syslog.cpp ] = [ FDirName $(HAIKU_TOP) src system libroot posix ] ; diff --git a/src/system/libroot/os/Jamfile b/src/system/libroot/os/Jamfile index feace3b2a1..7f08701da3 100644 --- a/src/system/libroot/os/Jamfile +++ b/src/system/libroot/os/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src system libroot os ; -UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ; +UsePrivateKernelHeaders ; MergeObject os_main.o : area.c @@ -24,8 +24,13 @@ MergeObject os_main.o : time.c syscalls.S wait_for_objects.cpp + + KMessage.cpp ; +SEARCH on [ FGristFiles KMessage.cpp ] + = [ FDirName $(HAIKU_TOP) src system kernel messaging ] ; + # We need to specify the dependency on the generated syscalls file explicitly. Depends [ FGristFiles syscalls.o ] : syscalls.S.inc ;