We compile the fs_shell with BuildPlatformMain, which is more correct. We

use all Haiku headers save the POSIX and STL headers. Let's see how we
fare on Linux with this change...


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11552 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-03-03 00:47:39 +00:00
parent 2585523bed
commit d2df6f5a20

View File

@ -3,6 +3,29 @@ SubDir OBOS_TOP src tests add-ons kernel file_systems bfs bfs_shell ;
SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems bfs r5 ;
# Same as SetupIncludes, but doesn't include the posix headers.
rule SetupFSShellIncludes
{
# XXX add "opengl" later
local os_includes = add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media mail midi midi2 net storage support translation ;
# Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times.
# Use headers directory, to allow to do things like include <posix/string.h>
HDRS = [ FDirName $(OBOS_TOP) headers ] ;
# Use public OS header directories
HDRS += [ PublicHeaders $(os_includes) ] ;
# Use the root of the private headers -- not so nice, but simplifies things.
HDRS += [ PrivateHeaders $(DOT) ] ;
# The platform dependent headers.
HDRS += $(PLATFORM_HEADERS) ;
}
SetupFSShellIncludes ;
UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp
{
@ -25,18 +48,21 @@ UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp
}
local fsShellSources =
fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
fsh.cpp rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
stub.c tracker.cpp sysdep.c hexdump.c argv.c
;
SimpleTest bfs_shell :
BuildPlatformMain bfs_shell :
$(fsShellSources)
Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
Debug.cpp kernel_cpp.cpp
:
;
additional_commands.c
: false # don't reset header search dirs
;
# Tell Jam where to find these sources
SEARCH on [ FGristFiles