From 718b5114e0613a5602d5d6296afeaa7f3ee4b576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 13 Apr 2005 13:59:17 +0000 Subject: [PATCH] This should fix the build after all the kernel/system renaming. If anything is still broken (and was not before :)), please shout. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12361 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/Jamfile | 2 +- src/system/Jamfile | 12 ++-- src/system/boot/Jamfile | 8 +-- src/system/boot/arch/Jamfile | 4 +- src/system/boot/arch/alpha/Jamfile | 2 +- src/system/boot/arch/m68k/Jamfile | 2 +- src/system/boot/arch/mips/Jamfile | 2 +- src/system/boot/arch/ppc/Jamfile | 2 +- src/system/boot/arch/sh4/Jamfile | 2 +- src/system/boot/arch/sparc/Jamfile | 2 +- src/system/boot/arch/sparc64/Jamfile | 2 +- src/system/boot/arch/x86/Jamfile | 2 +- src/system/boot/loader/Jamfile | 10 +-- src/system/boot/loader/file_systems/Jamfile | 8 +-- .../loader/file_systems/amiga_ffs/Jamfile | 2 +- .../boot/loader/file_systems/bfs/Jamfile | 2 +- .../boot/loader/file_systems/hfs_plus/Jamfile | 2 +- src/system/boot/platform/Jamfile | 4 +- src/system/boot/platform/bios_ia32/Jamfile | 2 +- src/system/boot/platform/openfirmware/Jamfile | 6 +- .../boot/platform/openfirmware/arch/Jamfile | 4 +- .../platform/openfirmware/arch/ppc/Jamfile | 6 +- src/system/glue/Jamfile | 4 +- src/system/glue/arch/Jamfile | 2 +- src/system/glue/arch/ppc/Jamfile | 2 +- src/system/glue/arch/x86/Jamfile | 2 +- src/system/kernel/Jamfile | 20 +++--- src/system/kernel/arch/Jamfile | 4 +- src/system/kernel/arch/ppc/Jamfile | 2 +- src/system/kernel/arch/x86/Jamfile | 4 +- src/system/kernel/cache/Jamfile | 2 +- src/system/kernel/debug/Jamfile | 2 +- src/system/kernel/device_manager/Jamfile | 2 +- src/system/kernel/disk_device_manager/Jamfile | 2 +- src/system/kernel/fs/Jamfile | 2 +- src/system/kernel/messaging/Jamfile | 4 +- src/system/kernel/util/Jamfile | 2 +- src/system/kernel/vm/Jamfile | 2 +- src/system/libroot/Jamfile | 8 +-- src/system/libroot/os/Jamfile | 4 +- src/system/libroot/os/arch/Jamfile | 2 +- src/system/libroot/os/arch/ppc/Jamfile | 2 +- src/system/libroot/os/arch/x86/Jamfile | 2 +- src/system/libroot/posix/Jamfile | 28 ++++---- src/system/libroot/posix/arch/Jamfile | 4 +- src/system/libroot/posix/arch/ppc/Jamfile | 2 +- src/system/libroot/posix/arch/x86/Jamfile | 2 +- src/system/libroot/posix/glibc/Jamfile | 20 +++--- src/system/libroot/posix/glibc/arch/Jamfile | 4 +- .../libroot/posix/glibc/arch/ppc/Jamfile | 2 +- .../libroot/posix/glibc/arch/x86/Jamfile | 12 ++-- src/system/libroot/posix/glibc/ctype/Jamfile | 10 +-- .../libroot/posix/glibc/extensions/Jamfile | 12 ++-- src/system/libroot/posix/glibc/libio/Jamfile | 14 ++-- src/system/libroot/posix/glibc/locale/Jamfile | 10 +-- src/system/libroot/posix/glibc/regex/Jamfile | 2 +- .../libroot/posix/glibc/stdio-common/Jamfile | 14 ++-- src/system/libroot/posix/glibc/stdlib/Jamfile | 4 +- src/system/libroot/posix/glibc/wcsmbs/Jamfile | 16 ++--- src/system/libroot/posix/locale/Jamfile | 2 +- src/system/libroot/posix/malloc/Jamfile | 2 +- src/system/libroot/posix/math/Jamfile | 4 +- src/system/libroot/posix/math/arch/Jamfile | 4 +- .../libroot/posix/math/arch/ppc/Jamfile | 2 +- .../libroot/posix/math/arch/sh4/Jamfile | 2 +- .../libroot/posix/math/arch/x86/Jamfile | 2 +- src/system/libroot/posix/pthread/Jamfile | 2 +- src/system/libroot/posix/signal/Jamfile | 2 +- src/system/libroot/posix/stdio/Jamfile | 2 +- src/system/libroot/posix/stdlib/Jamfile | 2 +- src/system/libroot/posix/string/Jamfile | 2 +- src/system/libroot/posix/sys/Jamfile | 2 +- src/system/libroot/posix/time/Jamfile | 2 +- src/system/libroot/posix/unistd/Jamfile | 2 +- src/system/runtime_loader/Jamfile | 64 +++++++++---------- src/tests/add-ons/kernel/Jamfile | 6 +- src/tests/add-ons/kernel/disk_scanner/Jamfile | 2 +- .../kernel/file_systems/bfs/mkbfs/Jamfile | 2 +- .../kernel/file_systems/bfs/r5/Jamfile | 2 +- src/tests/add-ons/kernel/network/Jamfile | 2 +- .../network/ppp/shared/libkernelppp/Jamfile | 4 +- src/tests/kernel/boot/heap/Jamfile | 2 +- src/tests/kernel/boot/loader/Jamfile | 10 +-- .../loader/file_systems/amiga_ffs/Jamfile | 2 +- .../boot/loader/file_systems/bfs/Jamfile | 2 +- src/tests/kernel/boot_floppy/Jamfile | 41 ++++++------ src/tests/kernel/boot_floppy/cpuinfo/Jamfile | 2 +- .../kernel/boot_floppy/sockettest/Jamfile | 2 +- .../kernel/boot_floppy/testdigit/Jamfile | 2 +- src/tests/kernel/boot_floppy/tests/Jamfile | 6 +- src/tests/kernel/core/cache/Jamfile | 6 +- .../kernel/core/disk_device_manager/Jamfile | 8 +-- src/tests/kernel/libroot/os/Jamfile | 2 +- src/tests/kernel/libroot/posix/Jamfile | 2 +- src/tests/kernel/vm2/Jamfile | 2 +- 95 files changed, 264 insertions(+), 261 deletions(-) diff --git a/src/Jamfile b/src/Jamfile index a19ad5b2de..9fbb7f5151 100644 --- a/src/Jamfile +++ b/src/Jamfile @@ -4,10 +4,10 @@ SubInclude OBOS_TOP src add-ons ; SubInclude OBOS_TOP src apps ; SubInclude OBOS_TOP src bin ; SubInclude OBOS_TOP src data ; -SubInclude OBOS_TOP src kernel ; SubInclude OBOS_TOP src kits ; SubInclude OBOS_TOP src libs ; SubInclude OBOS_TOP src prefs ; SubInclude OBOS_TOP src servers ; +SubInclude OBOS_TOP src system ; SubInclude OBOS_TOP src tests ; SubInclude OBOS_TOP src tools ; diff --git a/src/system/Jamfile b/src/system/Jamfile index 305a656ae7..0f7714f636 100644 --- a/src/system/Jamfile +++ b/src/system/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel ; +SubDir OBOS_TOP src system ; KernelLd boot_loader : boot_platform_$(OBOS_BOOT_PLATFORM).o @@ -181,8 +181,8 @@ BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ; Depends kernel.so : kernel ; # kernel.so will be rebuilt with the kernel -SubInclude OBOS_TOP src kernel boot ; -SubInclude OBOS_TOP src kernel core ; -SubInclude OBOS_TOP src kernel glue ; -SubInclude OBOS_TOP src kernel libroot ; -SubInclude OBOS_TOP src kernel runtime_loader ; +SubInclude OBOS_TOP src system boot ; +SubInclude OBOS_TOP src system kernel ; +SubInclude OBOS_TOP src system glue ; +SubInclude OBOS_TOP src system libroot ; +SubInclude OBOS_TOP src system runtime_loader ; diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index 20f5d68f16..a01cf17e0e 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot ; +SubDir OBOS_TOP src system boot ; #SetupIncludes ; #oldccflags = $(CCFLAGS) ; @@ -19,6 +19,6 @@ BuildPlatformMain makeflop : makeflop.c ; #CCFLAGS = $(oldccflags) ; -SubInclude OBOS_TOP src kernel boot arch ; -SubInclude OBOS_TOP src kernel boot platform ; -SubInclude OBOS_TOP src kernel boot loader ; +SubInclude OBOS_TOP src system boot arch ; +SubInclude OBOS_TOP src system boot platform ; +SubInclude OBOS_TOP src system boot loader ; diff --git a/src/system/boot/arch/Jamfile b/src/system/boot/arch/Jamfile index 85a832bb80..c0d6d91dd9 100644 --- a/src/system/boot/arch/Jamfile +++ b/src/system/boot/arch/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel boot arch ; +SubDir OBOS_TOP src system boot arch ; -SubInclude OBOS_TOP src kernel boot arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system boot arch $(OBOS_ARCH) ; diff --git a/src/system/boot/arch/alpha/Jamfile b/src/system/boot/arch/alpha/Jamfile index f7914b2ccc..1b3f4c5797 100644 --- a/src/system/boot/arch/alpha/Jamfile +++ b/src/system/boot/arch/alpha/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch alpha ; +SubDir OBOS_TOP src system boot arch alpha ; diff --git a/src/system/boot/arch/m68k/Jamfile b/src/system/boot/arch/m68k/Jamfile index 73940d9373..389fe41437 100644 --- a/src/system/boot/arch/m68k/Jamfile +++ b/src/system/boot/arch/m68k/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch m68k ; +SubDir OBOS_TOP src system boot arch m68k ; diff --git a/src/system/boot/arch/mips/Jamfile b/src/system/boot/arch/mips/Jamfile index 6079d7ae4e..2fa8db27e3 100644 --- a/src/system/boot/arch/mips/Jamfile +++ b/src/system/boot/arch/mips/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch mips ; +SubDir OBOS_TOP src system boot arch mips ; diff --git a/src/system/boot/arch/ppc/Jamfile b/src/system/boot/arch/ppc/Jamfile index 11dd1358f8..d3f8b04687 100644 --- a/src/system/boot/arch/ppc/Jamfile +++ b/src/system/boot/arch/ppc/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch ppc ; +SubDir OBOS_TOP src system boot arch ppc ; diff --git a/src/system/boot/arch/sh4/Jamfile b/src/system/boot/arch/sh4/Jamfile index ccb84f6e9c..0a8dbf87b4 100644 --- a/src/system/boot/arch/sh4/Jamfile +++ b/src/system/boot/arch/sh4/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch sh4 ; +SubDir OBOS_TOP src system boot arch sh4 ; diff --git a/src/system/boot/arch/sparc/Jamfile b/src/system/boot/arch/sparc/Jamfile index 15358c8555..1b74688cfb 100644 --- a/src/system/boot/arch/sparc/Jamfile +++ b/src/system/boot/arch/sparc/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch sparc ; +SubDir OBOS_TOP src system boot arch sparc ; diff --git a/src/system/boot/arch/sparc64/Jamfile b/src/system/boot/arch/sparc64/Jamfile index 4538b18ca1..2200cc0565 100644 --- a/src/system/boot/arch/sparc64/Jamfile +++ b/src/system/boot/arch/sparc64/Jamfile @@ -1,2 +1,2 @@ -SubDir OBOS_TOP src kernel boot arch sparc64 ; +SubDir OBOS_TOP src system boot arch sparc64 ; diff --git a/src/system/boot/arch/x86/Jamfile b/src/system/boot/arch/x86/Jamfile index 40ff66d354..843c4c2d7e 100644 --- a/src/system/boot/arch/x86/Jamfile +++ b/src/system/boot/arch/x86/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot arch x86 ; +SubDir OBOS_TOP src system boot arch x86 ; KernelMergeObject boot_arch_stage2.o : <$(SOURCE_GRIST)>stage2.c diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile index 16cfa9ed5c..95cedb7d19 100644 --- a/src/system/boot/loader/Jamfile +++ b/src/system/boot/loader/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot loader ; +SubDir OBOS_TOP src system boot loader ; # SubDirHdrs $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; @@ -62,10 +62,10 @@ KernelStaticLibrary boot_partitions : # Tell Jam where to find the utility sources SEARCH on [ FGristFiles kernel_cpp.cpp list.c ] - = [ FDirName $(OBOS_TOP) src kernel core util ] ; + = [ FDirName $(OBOS_TOP) src system kernel util ] ; SEARCH on [ FGristFiles driver_settings.c ] - = [ FDirName $(OBOS_TOP) src kernel libroot os ] ; + = [ FDirName $(OBOS_TOP) src system libroot os ] ; SEARCH on [ FGristFiles amiga_rdb.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ] ; @@ -77,7 +77,7 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ; SEARCH on [ FGristFiles stage2_crt0.S ] - = [ FDirName $(OBOS_TOP) src kernel boot arch $(OBOS_ARCH) ] ; + = [ FDirName $(OBOS_TOP) src system boot arch $(OBOS_ARCH) ] ; -SubInclude OBOS_TOP src kernel boot loader file_systems ; +SubInclude OBOS_TOP src system boot loader file_systems ; diff --git a/src/system/boot/loader/file_systems/Jamfile b/src/system/boot/loader/file_systems/Jamfile index 7f6461ae86..dbf010063d 100644 --- a/src/system/boot/loader/file_systems/Jamfile +++ b/src/system/boot/loader/file_systems/Jamfile @@ -1,5 +1,5 @@ -SubDir OBOS_TOP src kernel boot loader file_systems ; +SubDir OBOS_TOP src system boot loader file_systems ; -SubInclude OBOS_TOP src kernel boot loader file_systems bfs ; -SubInclude OBOS_TOP src kernel boot loader file_systems hfs_plus ; -SubInclude OBOS_TOP src kernel boot loader file_systems amiga_ffs ; +SubInclude OBOS_TOP src system boot loader file_systems bfs ; +SubInclude OBOS_TOP src system boot loader file_systems hfs_plus ; +SubInclude OBOS_TOP src system boot loader file_systems amiga_ffs ; diff --git a/src/system/boot/loader/file_systems/amiga_ffs/Jamfile b/src/system/boot/loader/file_systems/amiga_ffs/Jamfile index 9219657e85..3c9ad7457d 100644 --- a/src/system/boot/loader/file_systems/amiga_ffs/Jamfile +++ b/src/system/boot/loader/file_systems/amiga_ffs/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot loader file_systems amiga_ffs ; +SubDir OBOS_TOP src system boot loader file_systems amiga_ffs ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; diff --git a/src/system/boot/loader/file_systems/bfs/Jamfile b/src/system/boot/loader/file_systems/bfs/Jamfile index 5754c51a3b..c263696f68 100644 --- a/src/system/boot/loader/file_systems/bfs/Jamfile +++ b/src/system/boot/loader/file_systems/bfs/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot loader file_systems bfs ; +SubDir OBOS_TOP src system boot loader file_systems bfs ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; diff --git a/src/system/boot/loader/file_systems/hfs_plus/Jamfile b/src/system/boot/loader/file_systems/hfs_plus/Jamfile index 1e538c2c8a..d441c2f260 100644 --- a/src/system/boot/loader/file_systems/hfs_plus/Jamfile +++ b/src/system/boot/loader/file_systems/hfs_plus/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot loader file_systems hfs_plus ; +SubDir OBOS_TOP src system boot loader file_systems hfs_plus ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; diff --git a/src/system/boot/platform/Jamfile b/src/system/boot/platform/Jamfile index 4fe018f321..2b85d17c29 100644 --- a/src/system/boot/platform/Jamfile +++ b/src/system/boot/platform/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel boot platform ; +SubDir OBOS_TOP src system boot platform ; -SubInclude OBOS_TOP src kernel boot platform $(OBOS_BOOT_PLATFORM) ; +SubInclude OBOS_TOP src system boot platform $(OBOS_BOOT_PLATFORM) ; diff --git a/src/system/boot/platform/bios_ia32/Jamfile b/src/system/boot/platform/bios_ia32/Jamfile index 48d4299d3e..471c0348b0 100644 --- a/src/system/boot/platform/bios_ia32/Jamfile +++ b/src/system/boot/platform/bios_ia32/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot platform bios_ia32 ; +SubDir OBOS_TOP src system boot platform bios_ia32 ; SubDirHdrs $(OBOS_TOP) headers private kernel boot platform $(OBOS_BOOT_PLATFORM) ; diff --git a/src/system/boot/platform/openfirmware/Jamfile b/src/system/boot/platform/openfirmware/Jamfile index dbc185125f..6dfb89bcf9 100644 --- a/src/system/boot/platform/openfirmware/Jamfile +++ b/src/system/boot/platform/openfirmware/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel boot platform openfirmware ; +SubDir OBOS_TOP src system boot platform openfirmware ; SubDirC++Flags -fno-rtti ; @@ -18,6 +18,6 @@ KernelMergeObject boot_platform_openfirmware.o : ; SEARCH on [ FGristFiles crt0.S ] - = [ FDirName $(OBOS_TOP) src kernel boot arch $(OBOS_ARCH) ] ; + = [ FDirName $(OBOS_TOP) src system boot arch $(OBOS_ARCH) ] ; -SubInclude OBOS_TOP src kernel boot platform openfirmware arch ; +SubInclude OBOS_TOP src system boot platform openfirmware arch ; diff --git a/src/system/boot/platform/openfirmware/arch/Jamfile b/src/system/boot/platform/openfirmware/arch/Jamfile index e73682af5d..1e5438efdd 100644 --- a/src/system/boot/platform/openfirmware/arch/Jamfile +++ b/src/system/boot/platform/openfirmware/arch/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel boot platform openfirmware arch ; +SubDir OBOS_TOP src system boot platform openfirmware arch ; -SubInclude OBOS_TOP src kernel boot platform openfirmware arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system boot platform openfirmware arch $(OBOS_ARCH) ; diff --git a/src/system/boot/platform/openfirmware/arch/ppc/Jamfile b/src/system/boot/platform/openfirmware/arch/ppc/Jamfile index c4e311209d..1ab5e3f8d6 100644 --- a/src/system/boot/platform/openfirmware/arch/ppc/Jamfile +++ b/src/system/boot/platform/openfirmware/arch/ppc/Jamfile @@ -1,6 +1,6 @@ -SubDir OBOS_TOP src kernel boot platform openfirmware arch ppc ; +SubDir OBOS_TOP src system boot platform openfirmware arch ppc ; -SubDirHdrs $(OBOS_TOP) src kernel boot platform $(OBOS_BOOT_PLATFORM) ; +SubDirHdrs $(OBOS_TOP) src system boot platform $(OBOS_BOOT_PLATFORM) ; SubDirC++Flags -fno-rtti ; @@ -12,4 +12,4 @@ KernelStaticLibrary boot_platform_openfirmware_ppc : ; SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] - = [ FDirName $(OBOS_TOP) src kernel core arch $(OBOS_ARCH) ] ; + = [ FDirName $(OBOS_TOP) src system kernel arch $(OBOS_ARCH) ] ; diff --git a/src/system/glue/Jamfile b/src/system/glue/Jamfile index 2acd866a6a..3297af10cd 100644 --- a/src/system/glue/Jamfile +++ b/src/system/glue/Jamfile @@ -1,8 +1,8 @@ -SubDir OBOS_TOP src kernel glue ; +SubDir OBOS_TOP src system glue ; KernelObjects init_term_dyn.c start_dyn.c ; -SubInclude OBOS_TOP src kernel glue arch ; +SubInclude OBOS_TOP src system glue arch ; diff --git a/src/system/glue/arch/Jamfile b/src/system/glue/arch/Jamfile index 4b6b6f7a6b..428cc8dc2e 100644 --- a/src/system/glue/arch/Jamfile +++ b/src/system/glue/arch/Jamfile @@ -1 +1 @@ -SubInclude OBOS_TOP src kernel glue arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system glue arch $(OBOS_ARCH) ; diff --git a/src/system/glue/arch/ppc/Jamfile b/src/system/glue/arch/ppc/Jamfile index a73941e2d0..55d4c933cf 100644 --- a/src/system/glue/arch/ppc/Jamfile +++ b/src/system/glue/arch/ppc/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel glue arch ppc ; +SubDir OBOS_TOP src system glue arch ppc ; KernelObjects crti.S diff --git a/src/system/glue/arch/x86/Jamfile b/src/system/glue/arch/x86/Jamfile index 21d6039251..0bb2a452c7 100644 --- a/src/system/glue/arch/x86/Jamfile +++ b/src/system/glue/arch/x86/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel glue arch x86 ; +SubDir OBOS_TOP src system glue arch x86 ; KernelObjects crti.S diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index c25ee1c70f..0d39c4c684 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core ; +SubDir OBOS_TOP src system kernel ; local buildSources = ; if $(OS) != BEOS { @@ -58,12 +58,12 @@ KernelLd linkhack.so : -shared -Bdynamic ; -SubInclude OBOS_TOP src kernel core arch ; -SubInclude OBOS_TOP src kernel core cache ; -SubInclude OBOS_TOP src kernel core device_manager ; -SubInclude OBOS_TOP src kernel core debug ; -SubInclude OBOS_TOP src kernel core disk_device_manager ; -SubInclude OBOS_TOP src kernel core fs ; -SubInclude OBOS_TOP src kernel core messaging ; -SubInclude OBOS_TOP src kernel core util ; -SubInclude OBOS_TOP src kernel core vm ; +SubInclude OBOS_TOP src system kernel arch ; +SubInclude OBOS_TOP src system kernel cache ; +SubInclude OBOS_TOP src system kernel device_manager ; +SubInclude OBOS_TOP src system kernel debug ; +SubInclude OBOS_TOP src system kernel disk_device_manager ; +SubInclude OBOS_TOP src system kernel fs ; +SubInclude OBOS_TOP src system kernel messaging ; +SubInclude OBOS_TOP src system kernel util ; +SubInclude OBOS_TOP src system kernel vm ; diff --git a/src/system/kernel/arch/Jamfile b/src/system/kernel/arch/Jamfile index 8e77c2f387..fe6a423a76 100644 --- a/src/system/kernel/arch/Jamfile +++ b/src/system/kernel/arch/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel core arch ; +SubDir OBOS_TOP src system kernel arch ; -SubInclude OBOS_TOP src kernel core arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system kernel arch $(OBOS_ARCH) ; diff --git a/src/system/kernel/arch/ppc/Jamfile b/src/system/kernel/arch/ppc/Jamfile index 8b4014e0e1..935c6349f0 100644 --- a/src/system/kernel/arch/ppc/Jamfile +++ b/src/system/kernel/arch/ppc/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core arch ppc ; +SubDir OBOS_TOP src system kernel arch ppc ; KernelStaticLibrary libppc : arch_atomic.c diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile index ba2fbe0d6d..3b9d557a21 100644 --- a/src/system/kernel/arch/x86/Jamfile +++ b/src/system/kernel/arch/x86/Jamfile @@ -1,7 +1,7 @@ -SubDir OBOS_TOP src kernel core arch x86 ; +SubDir OBOS_TOP src system kernel arch x86 ; # for syscall_numbers.h -SubDirHdrs [ FObjectsDir src kernel core ] ; +SubDirHdrs [ FObjectsDir src system kernel ] ; KernelStaticLibrary libx86 : arch_cpu.c diff --git a/src/system/kernel/cache/Jamfile b/src/system/kernel/cache/Jamfile index e265b077e3..62803ddf2d 100644 --- a/src/system/kernel/cache/Jamfile +++ b/src/system/kernel/cache/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core cache ; +SubDir OBOS_TOP src system kernel cache ; KernelMergeObject kernel_cache.o : block_cache.cpp diff --git a/src/system/kernel/debug/Jamfile b/src/system/kernel/debug/Jamfile index b740bcd8ea..6458e275c5 100644 --- a/src/system/kernel/debug/Jamfile +++ b/src/system/kernel/debug/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core debug ; +SubDir OBOS_TOP src system kernel debug ; UsePrivateHeaders [ FDirName kernel debug ] ; diff --git a/src/system/kernel/device_manager/Jamfile b/src/system/kernel/device_manager/Jamfile index bc0e0aa545..24dd47798d 100644 --- a/src/system/kernel/device_manager/Jamfile +++ b/src/system/kernel/device_manager/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core device_manager ; +SubDir OBOS_TOP src system kernel device_manager ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/system/kernel/disk_device_manager/Jamfile b/src/system/kernel/disk_device_manager/Jamfile index d756156521..ba553a98b9 100644 --- a/src/system/kernel/disk_device_manager/Jamfile +++ b/src/system/kernel/disk_device_manager/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core disk_device_manager ; +SubDir OBOS_TOP src system kernel disk_device_manager ; SEARCH_SOURCE += [ FDirName $(SUBDIR) jobs ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kits storage ] ; diff --git a/src/system/kernel/fs/Jamfile b/src/system/kernel/fs/Jamfile index 498e60f4b2..f901f0a4a3 100644 --- a/src/system/kernel/fs/Jamfile +++ b/src/system/kernel/fs/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core fs ; +SubDir OBOS_TOP src system kernel fs ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel fs ] ; diff --git a/src/system/kernel/messaging/Jamfile b/src/system/kernel/messaging/Jamfile index a9bb723fb4..2c34f56acf 100644 --- a/src/system/kernel/messaging/Jamfile +++ b/src/system/kernel/messaging/Jamfile @@ -1,11 +1,11 @@ -SubDir OBOS_TOP src kernel core messaging ; +SubDir OBOS_TOP src system kernel messaging ; UsePrivateHeaders [ FDirName kernel ] ; #UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; #UsePrivateHeaders [ FDirName kernel fs ] ; UsePrivateHeaders [ FDirName kernel util ] ; # for UsePrivateHeaders shared ; -UseHeaders [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ; +UseHeaders [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ; # for "Locker.h" KernelMergeObject kernel_messaging.o : diff --git a/src/system/kernel/util/Jamfile b/src/system/kernel/util/Jamfile index ca2803995a..b473363a54 100644 --- a/src/system/kernel/util/Jamfile +++ b/src/system/kernel/util/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core util ; +SubDir OBOS_TOP src system kernel util ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/system/kernel/vm/Jamfile b/src/system/kernel/vm/Jamfile index a0ec0fc92c..12dd1fb285 100644 --- a/src/system/kernel/vm/Jamfile +++ b/src/system/kernel/vm/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel core vm ; +SubDir OBOS_TOP src system kernel vm ; KernelMergeObject kernel_vm.o : vm.c diff --git a/src/system/libroot/Jamfile b/src/system/libroot/Jamfile index dc4cfae6c1..e5e8b9bca4 100644 --- a/src/system/libroot/Jamfile +++ b/src/system/libroot/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot ; +SubDir OBOS_TOP src system libroot ; UsePrivateHeaders libroot ; @@ -21,7 +21,7 @@ KernelMergeObject kernel_os_main.o : SEARCH on [ FGristFiles driver_settings.c fs_info.c - ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot os ] ; # kernel libroot posix files @@ -115,5 +115,5 @@ KernelMergeObject kernel_posix.o : : -fno-pic ; -SubInclude OBOS_TOP src kernel libroot os ; -SubInclude OBOS_TOP src kernel libroot posix ; +SubInclude OBOS_TOP src system libroot os ; +SubInclude OBOS_TOP src system libroot posix ; diff --git a/src/system/libroot/os/Jamfile b/src/system/libroot/os/Jamfile index 95ef1a789e..9b38d5bddc 100644 --- a/src/system/libroot/os/Jamfile +++ b/src/system/libroot/os/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot os ; +SubDir OBOS_TOP src system libroot os ; SubDirHdrs [ FCurrentObjectsDir ] ; @@ -30,4 +30,4 @@ KernelMergeObject os_main.o : # We need to specify the dependency on the generated syscalls file explicitly. Depends [ FGristFiles syscalls.o ] : syscalls.S.inc ; -SubInclude OBOS_TOP src kernel libroot os arch ; +SubInclude OBOS_TOP src system libroot os arch ; diff --git a/src/system/libroot/os/arch/Jamfile b/src/system/libroot/os/arch/Jamfile index 1953b02299..e79f7da6e5 100644 --- a/src/system/libroot/os/arch/Jamfile +++ b/src/system/libroot/os/arch/Jamfile @@ -1 +1 @@ -SubInclude OBOS_TOP src kernel libroot os arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system libroot os arch $(OBOS_ARCH) ; diff --git a/src/system/libroot/os/arch/ppc/Jamfile b/src/system/libroot/os/arch/ppc/Jamfile index 65a7466001..9128822187 100644 --- a/src/system/libroot/os/arch/ppc/Jamfile +++ b/src/system/libroot/os/arch/ppc/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot os arch ppc ; +SubDir OBOS_TOP src system libroot os arch ppc ; KernelMergeObject os_arch_$(OBOS_ARCH).o : <$(SOURCE_GRIST)>atomic.S diff --git a/src/system/libroot/os/arch/x86/Jamfile b/src/system/libroot/os/arch/x86/Jamfile index 9e40ab2f57..7c5fdb3bb9 100644 --- a/src/system/libroot/os/arch/x86/Jamfile +++ b/src/system/libroot/os/arch/x86/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot os arch x86 ; +SubDir OBOS_TOP src system libroot os arch x86 ; KernelMergeObject os_arch_$(OBOS_ARCH).o : atomic.S diff --git a/src/system/libroot/posix/Jamfile b/src/system/libroot/posix/Jamfile index 6c8eced2b5..9f86518f3d 100644 --- a/src/system/libroot/posix/Jamfile +++ b/src/system/libroot/posix/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix ; +SubDir OBOS_TOP src system libroot posix ; UsePrivateHeaders [ FDirName syslog_daemon ] ; @@ -19,18 +19,18 @@ KernelMergeObject posix_main.o : : -fPIC -DPIC ; -SubInclude OBOS_TOP src kernel libroot posix arch ; +SubInclude OBOS_TOP src system libroot posix arch ; -SubInclude OBOS_TOP src kernel libroot posix locale ; -SubInclude OBOS_TOP src kernel libroot posix malloc ; -SubInclude OBOS_TOP src kernel libroot posix math ; -SubInclude OBOS_TOP src kernel libroot posix pthread ; -SubInclude OBOS_TOP src kernel libroot posix signal ; -SubInclude OBOS_TOP src kernel libroot posix stdio ; -SubInclude OBOS_TOP src kernel libroot posix stdlib ; -SubInclude OBOS_TOP src kernel libroot posix string ; -SubInclude OBOS_TOP src kernel libroot posix sys ; -SubInclude OBOS_TOP src kernel libroot posix time ; -SubInclude OBOS_TOP src kernel libroot posix unistd ; +SubInclude OBOS_TOP src system libroot posix locale ; +SubInclude OBOS_TOP src system libroot posix malloc ; +SubInclude OBOS_TOP src system libroot posix math ; +SubInclude OBOS_TOP src system libroot posix pthread ; +SubInclude OBOS_TOP src system libroot posix signal ; +SubInclude OBOS_TOP src system libroot posix stdio ; +SubInclude OBOS_TOP src system libroot posix stdlib ; +SubInclude OBOS_TOP src system libroot posix string ; +SubInclude OBOS_TOP src system libroot posix sys ; +SubInclude OBOS_TOP src system libroot posix time ; +SubInclude OBOS_TOP src system libroot posix unistd ; -SubInclude OBOS_TOP src kernel libroot posix glibc ; +SubInclude OBOS_TOP src system libroot posix glibc ; diff --git a/src/system/libroot/posix/arch/Jamfile b/src/system/libroot/posix/arch/Jamfile index 3a3f4420cb..53d11653d8 100644 --- a/src/system/libroot/posix/arch/Jamfile +++ b/src/system/libroot/posix/arch/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel libroot posix arch ; +SubDir OBOS_TOP src system libroot posix arch ; -SubInclude OBOS_TOP src kernel libroot posix arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system libroot posix arch $(OBOS_ARCH) ; diff --git a/src/system/libroot/posix/arch/ppc/Jamfile b/src/system/libroot/posix/arch/ppc/Jamfile index dced05f464..a988d6b4ba 100644 --- a/src/system/libroot/posix/arch/ppc/Jamfile +++ b/src/system/libroot/posix/arch/ppc/Jamfile @@ -1 +1 @@ -SubDir OBOS_TOP src kernel libroot posix arch ppc ; +SubDir OBOS_TOP src system libroot posix arch ppc ; diff --git a/src/system/libroot/posix/arch/x86/Jamfile b/src/system/libroot/posix/arch/x86/Jamfile index 4bd90efaf1..bec0e60f2a 100644 --- a/src/system/libroot/posix/arch/x86/Jamfile +++ b/src/system/libroot/posix/arch/x86/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix arch x86 ; +SubDir OBOS_TOP src system libroot posix arch x86 ; KernelMergeObject posix_arch_$(OBOS_ARCH).o : setjmp.c diff --git a/src/system/libroot/posix/glibc/Jamfile b/src/system/libroot/posix/glibc/Jamfile index b7ec886d9c..e50c14f23d 100644 --- a/src/system/libroot/posix/glibc/Jamfile +++ b/src/system/libroot/posix/glibc/Jamfile @@ -1,11 +1,11 @@ -SubDir OBOS_TOP src kernel libroot posix glibc ; +SubDir OBOS_TOP src system libroot posix glibc ; -SubInclude OBOS_TOP src kernel libroot posix glibc arch ; -SubInclude OBOS_TOP src kernel libroot posix glibc ctype ; -SubInclude OBOS_TOP src kernel libroot posix glibc extensions ; -SubInclude OBOS_TOP src kernel libroot posix glibc locale ; -SubInclude OBOS_TOP src kernel libroot posix glibc libio ; -SubInclude OBOS_TOP src kernel libroot posix glibc regex ; -SubInclude OBOS_TOP src kernel libroot posix glibc stdio-common ; -SubInclude OBOS_TOP src kernel libroot posix glibc stdlib ; -SubInclude OBOS_TOP src kernel libroot posix glibc wcsmbs ; +SubInclude OBOS_TOP src system libroot posix glibc arch ; +SubInclude OBOS_TOP src system libroot posix glibc ctype ; +SubInclude OBOS_TOP src system libroot posix glibc extensions ; +SubInclude OBOS_TOP src system libroot posix glibc locale ; +SubInclude OBOS_TOP src system libroot posix glibc libio ; +SubInclude OBOS_TOP src system libroot posix glibc regex ; +SubInclude OBOS_TOP src system libroot posix glibc stdio-common ; +SubInclude OBOS_TOP src system libroot posix glibc stdlib ; +SubInclude OBOS_TOP src system libroot posix glibc wcsmbs ; diff --git a/src/system/libroot/posix/glibc/arch/Jamfile b/src/system/libroot/posix/glibc/arch/Jamfile index a73b320376..fce258489d 100644 --- a/src/system/libroot/posix/glibc/arch/Jamfile +++ b/src/system/libroot/posix/glibc/arch/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix glibc arch ; +SubDir OBOS_TOP src system libroot posix glibc arch ; -SubInclude OBOS_TOP src kernel libroot posix glibc arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system libroot posix glibc arch $(OBOS_ARCH) ; diff --git a/src/system/libroot/posix/glibc/arch/ppc/Jamfile b/src/system/libroot/posix/glibc/arch/ppc/Jamfile index 4bd90efaf1..bec0e60f2a 100644 --- a/src/system/libroot/posix/glibc/arch/ppc/Jamfile +++ b/src/system/libroot/posix/glibc/arch/ppc/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix arch x86 ; +SubDir OBOS_TOP src system libroot posix arch x86 ; KernelMergeObject posix_arch_$(OBOS_ARCH).o : setjmp.c diff --git a/src/system/libroot/posix/glibc/arch/x86/Jamfile b/src/system/libroot/posix/glibc/arch/x86/Jamfile index c250c2d03b..9d4b8244e7 100644 --- a/src/system/libroot/posix/glibc/arch/x86/Jamfile +++ b/src/system/libroot/posix/glibc/arch/x86/Jamfile @@ -1,9 +1,9 @@ -SubDir OBOS_TOP src kernel libroot posix glibc arch x86 ; +SubDir OBOS_TOP src system libroot posix glibc arch x86 ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc stdlib ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc stdlib ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; KernelMergeObject posix_gnu_arch_$(OBOS_ARCH).o : add_n.S @@ -24,4 +24,4 @@ KernelMergeObject posix_gnu_arch_$(OBOS_ARCH).o : SEARCH on [ FGristFiles cmp.c divrem.c mul.c mul_n.c dbl2mpn.c - ] = [ FDirName $(OBOS_TOP) src kernel libroot posix glibc arch ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot posix glibc arch ] ; diff --git a/src/system/libroot/posix/glibc/ctype/Jamfile b/src/system/libroot/posix/glibc/ctype/Jamfile index ba97189535..b51366aa7c 100644 --- a/src/system/libroot/posix/glibc/ctype/Jamfile +++ b/src/system/libroot/posix/glibc/ctype/Jamfile @@ -1,9 +1,9 @@ -SubDir OBOS_TOP src kernel libroot posix glibc ctype ; +SubDir OBOS_TOP src system libroot posix glibc ctype ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; KernelMergeObject posix_gnu_ctype.o : ctype-info.c diff --git a/src/system/libroot/posix/glibc/extensions/Jamfile b/src/system/libroot/posix/glibc/extensions/Jamfile index e24b0672fc..67cc6af99f 100644 --- a/src/system/libroot/posix/glibc/extensions/Jamfile +++ b/src/system/libroot/posix/glibc/extensions/Jamfile @@ -1,10 +1,10 @@ -SubDir OBOS_TOP src kernel libroot posix glibc extensions ; +SubDir OBOS_TOP src system libroot posix glibc extensions ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; KernelMergeObject posix_gnu_ext.o : getopt.c diff --git a/src/system/libroot/posix/glibc/libio/Jamfile b/src/system/libroot/posix/glibc/libio/Jamfile index f31bc4111c..dacff23fa2 100644 --- a/src/system/libroot/posix/glibc/libio/Jamfile +++ b/src/system/libroot/posix/glibc/libio/Jamfile @@ -1,11 +1,11 @@ -SubDir OBOS_TOP src kernel libroot posix glibc libio ; +SubDir OBOS_TOP src system libroot posix glibc libio ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -#SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc stdio-common ; -#SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +#SubDirHdrs $(OBOS_TOP) src system libroot posix glibc stdio-common ; +#SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; # For now, all wide character functions are disabled, # obprintf() is also disabled, because we don't have diff --git a/src/system/libroot/posix/glibc/locale/Jamfile b/src/system/libroot/posix/glibc/locale/Jamfile index 355eebfc69..40feccb312 100644 --- a/src/system/libroot/posix/glibc/locale/Jamfile +++ b/src/system/libroot/posix/glibc/locale/Jamfile @@ -1,9 +1,9 @@ -SubDir OBOS_TOP src kernel libroot posix glibc locale ; +SubDir OBOS_TOP src system libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; KernelMergeObject posix_gnu_locale.o : C-ctype.c diff --git a/src/system/libroot/posix/glibc/regex/Jamfile b/src/system/libroot/posix/glibc/regex/Jamfile index a0acd7f8fd..61aca3da17 100644 --- a/src/system/libroot/posix/glibc/regex/Jamfile +++ b/src/system/libroot/posix/glibc/regex/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix glibc regex ; +SubDir OBOS_TOP src system libroot posix glibc regex ; SubDirHdrs $(OBOS_TOP) headers ; diff --git a/src/system/libroot/posix/glibc/stdio-common/Jamfile b/src/system/libroot/posix/glibc/stdio-common/Jamfile index 6ce7344b06..3113100e9c 100644 --- a/src/system/libroot/posix/glibc/stdio-common/Jamfile +++ b/src/system/libroot/posix/glibc/stdio-common/Jamfile @@ -1,13 +1,13 @@ -SubDir OBOS_TOP src kernel libroot posix glibc stdio-common ; +SubDir OBOS_TOP src system libroot posix glibc stdio-common ; SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc stdio-common ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc stdio-common ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; # ToDo: for now, all wide character functions are disabled diff --git a/src/system/libroot/posix/glibc/stdlib/Jamfile b/src/system/libroot/posix/glibc/stdlib/Jamfile index fafbbc0df7..f200b57a95 100644 --- a/src/system/libroot/posix/glibc/stdlib/Jamfile +++ b/src/system/libroot/posix/glibc/stdlib/Jamfile @@ -1,6 +1,6 @@ -SubDir OBOS_TOP src kernel libroot posix glibc stdlib ; +SubDir OBOS_TOP src system libroot posix glibc stdlib ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; KernelMergeObject posix_gnu_stdlib.o : fpioconst.c diff --git a/src/system/libroot/posix/glibc/wcsmbs/Jamfile b/src/system/libroot/posix/glibc/wcsmbs/Jamfile index cd3be87d83..cbfdd99761 100644 --- a/src/system/libroot/posix/glibc/wcsmbs/Jamfile +++ b/src/system/libroot/posix/glibc/wcsmbs/Jamfile @@ -1,12 +1,12 @@ -SubDir OBOS_TOP src kernel libroot posix glibc wcsmbs ; +SubDir OBOS_TOP src system libroot posix glibc wcsmbs ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc wcsmbs ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc iconv ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ; -SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc wcsmbs ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc iconv ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ; +SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ; # ToDo: for now, all wide character functions are disabled diff --git a/src/system/libroot/posix/locale/Jamfile b/src/system/libroot/posix/locale/Jamfile index f7b2e63bc6..49c711459f 100644 --- a/src/system/libroot/posix/locale/Jamfile +++ b/src/system/libroot/posix/locale/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix locale ; +SubDir OBOS_TOP src system libroot posix locale ; KernelMergeObject posix_locale.o : #ctype.c diff --git a/src/system/libroot/posix/malloc/Jamfile b/src/system/libroot/posix/malloc/Jamfile index 6b81e24476..9547c2a02c 100644 --- a/src/system/libroot/posix/malloc/Jamfile +++ b/src/system/libroot/posix/malloc/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix malloc ; +SubDir OBOS_TOP src system libroot posix malloc ; KernelMergeObject posix_malloc.o : arch-specific.cpp diff --git a/src/system/libroot/posix/math/Jamfile b/src/system/libroot/posix/math/Jamfile index 627d78e62b..f2d7796556 100644 --- a/src/system/libroot/posix/math/Jamfile +++ b/src/system/libroot/posix/math/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix math ; +SubDir OBOS_TOP src system libroot posix math ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) glibc ] ; @@ -41,4 +41,4 @@ KernelMergeObject posix_math.o : -fPIC -DPIC ; -SubInclude OBOS_TOP src kernel libroot posix math arch ; +SubInclude OBOS_TOP src system libroot posix math arch ; diff --git a/src/system/libroot/posix/math/arch/Jamfile b/src/system/libroot/posix/math/arch/Jamfile index 1432f0abe2..a933201503 100644 --- a/src/system/libroot/posix/math/arch/Jamfile +++ b/src/system/libroot/posix/math/arch/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel libroot posix math arch ; +SubDir OBOS_TOP src system libroot posix math arch ; -SubInclude OBOS_TOP src kernel libroot posix math arch $(OBOS_ARCH) ; +SubInclude OBOS_TOP src system libroot posix math arch $(OBOS_ARCH) ; diff --git a/src/system/libroot/posix/math/arch/ppc/Jamfile b/src/system/libroot/posix/math/arch/ppc/Jamfile index d72a27b612..93e3242bde 100644 --- a/src/system/libroot/posix/math/arch/ppc/Jamfile +++ b/src/system/libroot/posix/math/arch/ppc/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix math arch ppc ; +SubDir OBOS_TOP src system libroot posix math arch ppc ; KernelMergeObject posix_math_arch_$(OBOS_ARCH).o : <$(SOURCE_GRIST)>fabs.c diff --git a/src/system/libroot/posix/math/arch/sh4/Jamfile b/src/system/libroot/posix/math/arch/sh4/Jamfile index 508feb3e43..a6f7afbeff 100644 --- a/src/system/libroot/posix/math/arch/sh4/Jamfile +++ b/src/system/libroot/posix/math/arch/sh4/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel libroot posix math arch sh4 ; +SubDir OBOS_TOP src system libroot posix math arch sh4 ; KernelStaticLibrary libmsh4 : fabs.S frexp.c isinf.c ldexp.c ; diff --git a/src/system/libroot/posix/math/arch/x86/Jamfile b/src/system/libroot/posix/math/arch/x86/Jamfile index b811d74b43..93ed03e951 100644 --- a/src/system/libroot/posix/math/arch/x86/Jamfile +++ b/src/system/libroot/posix/math/arch/x86/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix math arch x86 ; +SubDir OBOS_TOP src system libroot posix math arch x86 ; KernelMergeObject posix_math_arch_$(OBOS_ARCH).o : <$(SOURCE_GRIST)>fabs.S diff --git a/src/system/libroot/posix/pthread/Jamfile b/src/system/libroot/posix/pthread/Jamfile index c211bae450..d395f1caf3 100644 --- a/src/system/libroot/posix/pthread/Jamfile +++ b/src/system/libroot/posix/pthread/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix pthread ; +SubDir OBOS_TOP src system libroot posix pthread ; UsePrivateHeaders libroot ; diff --git a/src/system/libroot/posix/signal/Jamfile b/src/system/libroot/posix/signal/Jamfile index 8c5f335768..dfc599dafc 100644 --- a/src/system/libroot/posix/signal/Jamfile +++ b/src/system/libroot/posix/signal/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix signal ; +SubDir OBOS_TOP src system libroot posix signal ; KernelMergeObject posix_signal.o : kill.c diff --git a/src/system/libroot/posix/stdio/Jamfile b/src/system/libroot/posix/stdio/Jamfile index ed4022c9c7..b876183916 100644 --- a/src/system/libroot/posix/stdio/Jamfile +++ b/src/system/libroot/posix/stdio/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix stdio ; +SubDir OBOS_TOP src system libroot posix stdio ; KernelMergeObject posix_stdio.o : <$(SOURCE_GRIST)>remove.c diff --git a/src/system/libroot/posix/stdlib/Jamfile b/src/system/libroot/posix/stdlib/Jamfile index cf11b211ac..8699a283a1 100644 --- a/src/system/libroot/posix/stdlib/Jamfile +++ b/src/system/libroot/posix/stdlib/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix stdlib ; +SubDir OBOS_TOP src system libroot posix stdlib ; UsePrivateHeaders libroot ; diff --git a/src/system/libroot/posix/string/Jamfile b/src/system/libroot/posix/string/Jamfile index 5823877072..b631b90442 100644 --- a/src/system/libroot/posix/string/Jamfile +++ b/src/system/libroot/posix/string/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix string ; +SubDir OBOS_TOP src system libroot posix string ; KernelMergeObject posix_string.o : bcmp.c diff --git a/src/system/libroot/posix/sys/Jamfile b/src/system/libroot/posix/sys/Jamfile index 7d119a8108..d92a4073ac 100644 --- a/src/system/libroot/posix/sys/Jamfile +++ b/src/system/libroot/posix/sys/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix sys ; +SubDir OBOS_TOP src system libroot posix sys ; KernelMergeObject posix_sys.o : chmod.c diff --git a/src/system/libroot/posix/time/Jamfile b/src/system/libroot/posix/time/Jamfile index beacdaf5ce..4614429b6d 100644 --- a/src/system/libroot/posix/time/Jamfile +++ b/src/system/libroot/posix/time/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix time ; +SubDir OBOS_TOP src system libroot posix time ; # for localtime.c strftime.c SubDirCcFlags -DNOID -DTZDIR='\"/etc/timezones\"' -DUSG_COMPAT -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DPCTS=1 ; diff --git a/src/system/libroot/posix/unistd/Jamfile b/src/system/libroot/posix/unistd/Jamfile index f6fcf3937b..618471a1dd 100644 --- a/src/system/libroot/posix/unistd/Jamfile +++ b/src/system/libroot/posix/unistd/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel libroot posix unistd ; +SubDir OBOS_TOP src system libroot posix unistd ; KernelMergeObject posix_unistd.o : access.c diff --git a/src/system/runtime_loader/Jamfile b/src/system/runtime_loader/Jamfile index e0d12c63d0..08391287c3 100644 --- a/src/system/runtime_loader/Jamfile +++ b/src/system/runtime_loader/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel runtime_loader ; +SubDir OBOS_TOP src system runtime_loader ; KernelObjects rld.c @@ -10,40 +10,40 @@ KernelObjects KernelStaticLibraryObjects librld.a : # needed for rld.so only - syscalls.o - sem.o - atomic.o + syscalls.o + sem.o + atomic.o - errno.o + errno.o - ctype-info.o - C-ctype.o - C_name.o - kernel_vsprintf.o - open.o + ctype-info.o + C-ctype.o + C_name.o + kernel_vsprintf.o + open.o - memchr.o - memcmp.o - memcpy.o - memmove.o - memset.o - strcasecmp.o - strcat.o - strchr.o - strcmp.o - strcpy.o - strcspn.o - strdup.o - strerror.o - strlcat.o - strlcpy.o - strlen.o - strncmp.o - strnlen.o - strpbrk.o - strrchr.o - strspn.o - strstr.o + memchr.o + memcmp.o + memcpy.o + memmove.o + memset.o + strcasecmp.o + strcat.o + strchr.o + strcmp.o + strcpy.o + strcspn.o + strdup.o + strerror.o + strlcat.o + strlcpy.o + strlen.o + strncmp.o + strnlen.o + strpbrk.o + strrchr.o + strspn.o + strstr.o ; KernelLd rld.so : diff --git a/src/tests/add-ons/kernel/Jamfile b/src/tests/add-ons/kernel/Jamfile index 3bb6a5173e..475b68bcc6 100644 --- a/src/tests/add-ons/kernel/Jamfile +++ b/src/tests/add-ons/kernel/Jamfile @@ -18,15 +18,15 @@ AbsSymLink libkernelland_emu.so : libkernelland_emu.so SEARCH on [ FGristFiles strlcpy.c - ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ; SEARCH on [ FGristFiles lock.c - ] = [ FDirName $(OBOS_TOP) src kernel core ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel ] ; SEARCH on [ FGristFiles list.c - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; # SubInclude OBOS_TOP src tests add-ons kernel disk_scanner ; SubInclude OBOS_TOP src tests add-ons kernel drivers ; diff --git a/src/tests/add-ons/kernel/disk_scanner/Jamfile b/src/tests/add-ons/kernel/disk_scanner/Jamfile index be05a179ad..b8e41ba8a4 100644 --- a/src/tests/add-ons/kernel/disk_scanner/Jamfile +++ b/src/tests/add-ons/kernel/disk_scanner/Jamfile @@ -4,7 +4,7 @@ SubDir OBOS_TOP src tests add-ons kernel disk_scanner ; # # the test app # -#SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ] ; +#SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot os ] ; #SimpleTest DiskScannerTest : DiskScannerTest.cpp # : libkernelland_emu.so be stdc++.r4 ; #LOCATE on DiskScannerTest = [ on DiskScannerTest return $(LOCATE) ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile index e0ef9e8eab..d5cf1476d1 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile @@ -54,4 +54,4 @@ SEARCH on [ FGristFiles SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile index e229963b09..43b2ea5386 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile @@ -58,7 +58,7 @@ R5KernelAddon $(bfsAddOnName)_r5 : kernel file_systems : SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; #----------------------------------------------------- diff --git a/src/tests/add-ons/kernel/network/Jamfile b/src/tests/add-ons/kernel/network/Jamfile index 48b73968e5..1a6509cba7 100644 --- a/src/tests/add-ons/kernel/network/Jamfile +++ b/src/tests/add-ons/kernel/network/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders net ; # the network stack tester app -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot os ] ; SimpleTest net_stack_tester : net_stack_tester.cpp diff --git a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile index 8373ac79cd..2ac3dfb209 100644 --- a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile @@ -32,5 +32,5 @@ StaticLibrary kernelppp : driver_settings.c ; -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 ] ; diff --git a/src/tests/kernel/boot/heap/Jamfile b/src/tests/kernel/boot/heap/Jamfile index a72e20d3d6..84378dae9a 100644 --- a/src/tests/kernel/boot/heap/Jamfile +++ b/src/tests/kernel/boot/heap/Jamfile @@ -27,5 +27,5 @@ BuildPlatformTest heapTest : # Tell Jam where to find the utility sources SEARCH on [ FGristFiles heap.cpp - ] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ; + ] = [ FDirName $(OBOS_TOP) src system boot loader ] ; diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/kernel/boot/loader/Jamfile index 566407f447..1ccb5e1707 100644 --- a/src/tests/kernel/boot/loader/Jamfile +++ b/src/tests/kernel/boot/loader/Jamfile @@ -5,7 +5,7 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName storage ] ; UsePrivateHeaders [ FDirName shared ] ; SubDirHdrs $(OBOS_TOP) headers private kernel arch $(OBOS_ARCH) ; -SubDirHdrs $(OBOS_TOP) src kernel boot loader ; +SubDirHdrs $(OBOS_TOP) src system boot loader ; # we need to redefine certain calls in the boot loader so that # they will really be used instead of their POSIX counterparts @@ -102,20 +102,20 @@ SimpleTest BootLoaderTest : # Tell Jam where to find the utility sources SEARCH on [ FGristFiles list.c ] - = [ FDirName $(OBOS_TOP) src kernel core util ] ; + = [ FDirName $(OBOS_TOP) src system kernel util ] ; 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 driver_settings.c ] - = [ FDirName $(OBOS_TOP) src kernel libroot os ] ; + = [ FDirName $(OBOS_TOP) src system libroot os ] ; SEARCH on [ FGristFiles main.cpp vfs.cpp partitions.cpp heap.cpp RootFileSystem.cpp elf.cpp menu.cpp loader.cpp kernel_args.cpp load_driver_settings.cpp - ] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ; + ] = [ FDirName $(OBOS_TOP) src system boot loader ] ; # partitioning system modules diff --git a/src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile b/src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile index 40a6bb25c8..936401aee7 100644 --- a/src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile +++ b/src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile @@ -26,4 +26,4 @@ KernelStaticLibrary boottest_amiga_ffs : SEARCH on [ FGristFiles amiga_ffs.cpp Volume.cpp Directory.cpp File.cpp - ] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems amiga_ffs ] ; + ] = [ FDirName $(OBOS_TOP) src system boot loader file_systems amiga_ffs ] ; diff --git a/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile b/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile index 963fa35bd3..a0978f7044 100644 --- a/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile +++ b/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile @@ -31,5 +31,5 @@ KernelStaticLibrary boottest_bfs.a : SEARCH on [ FGristFiles bfs.cpp Directory.cpp File.cpp Link.cpp Stream.cpp BPlusTree.cpp - ] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems bfs ] ; + ] = [ FDirName $(OBOS_TOP) src system boot loader file_systems bfs ] ; diff --git a/src/tests/kernel/boot_floppy/Jamfile b/src/tests/kernel/boot_floppy/Jamfile index 44c337af72..5e074f96d0 100644 --- a/src/tests/kernel/boot_floppy/Jamfile +++ b/src/tests/kernel/boot_floppy/Jamfile @@ -23,7 +23,7 @@ KernelLd init : libglue2.o <$(SOURCE_GRIST)>init.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/init @@ -33,7 +33,7 @@ KernelLd kernel_false : libglue2.o <$(SOURCE_GRIST)>false_main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/false @@ -43,7 +43,7 @@ KernelLd kernel_true : libglue2.o <$(SOURCE_GRIST)>true_main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/true @@ -53,7 +53,7 @@ KernelLd fibo : libglue2.o <$(SOURCE_GRIST)>fibo_main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/fibo @@ -63,7 +63,7 @@ KernelLd sig_test : libglue2.o <$(SOURCE_GRIST)>sig_test.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/sig_test @@ -73,7 +73,7 @@ KernelLd monitor_test : libglue2.o <$(SOURCE_GRIST)>monitor_test.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/monitor_test @@ -83,7 +83,7 @@ KernelLd kernel_fortune : libglue2.o <$(SOURCE_GRIST)!fortune>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/fortune @@ -95,7 +95,7 @@ KernelLd kernel_ls : libglue2.o <$(SOURCE_GRIST)!ls>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/ls @@ -105,7 +105,7 @@ KernelLd kernel_ln : libglue2.o <$(SOURCE_GRIST)!symlink>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/symlink @@ -115,7 +115,7 @@ KernelLd boot_floppy_consoled : libglue2.o consoled.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/consoled @@ -134,7 +134,7 @@ KernelLd obos_shell : <$(SOURCE_GRIST)!shell>statements.o <$(SOURCE_GRIST)!shell>shell_history.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/sh @@ -144,7 +144,7 @@ KernelLd kernel_testapp : libglue2.o <$(SOURCE_GRIST)!testapp>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/testapp @@ -154,7 +154,7 @@ KernelLd tls_test : libglue2.o <$(SOURCE_GRIST)>tls_test.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/tls_test @@ -164,7 +164,7 @@ KernelLd pipe_test : libglue2.o <$(SOURCE_GRIST)>pipe_test.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/pipe_test @@ -174,7 +174,7 @@ KernelLd fork_test : libglue2.o <$(SOURCE_GRIST)>fork_test.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/fork_test @@ -199,7 +199,7 @@ KernelLd kernel_ps : libglue2.o <$(SOURCE_GRIST)!ps>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/ps @@ -209,7 +209,7 @@ KernelLd kernel_echo : libglue2.o <$(SOURCE_GRIST)!echo>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/echo @@ -219,13 +219,16 @@ KernelLd kernel_uname : libglue2.o <$(SOURCE_GRIST)!uname>main.o libroot.so - : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : beos/bin/uname ; -KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(OBOS_TOP)/src/kernel/boot/arch/$(OBOS_ARCH)/bootblock.bin ; +KernelFloppyImage $(OBOS_FLOPPY) + : $(OBOS_KERNEL) + : $(OBOS_TOP)/src/system/boot/arch/$(OBOS_ARCH)/bootblock.bin + ; Depends $(OBOS_FLOPPY) : tty ; Depends $(OBOS_FLOPPY) : console ; diff --git a/src/tests/kernel/boot_floppy/cpuinfo/Jamfile b/src/tests/kernel/boot_floppy/cpuinfo/Jamfile index 96703f5fb5..f422efc103 100644 --- a/src/tests/kernel/boot_floppy/cpuinfo/Jamfile +++ b/src/tests/kernel/boot_floppy/cpuinfo/Jamfile @@ -11,7 +11,7 @@ KernelLd cpuinfo : <$(SOURCE_GRIST)>main.o libroot.so : - $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : diff --git a/src/tests/kernel/boot_floppy/sockettest/Jamfile b/src/tests/kernel/boot_floppy/sockettest/Jamfile index 3d05522c5d..8aac5a4e72 100644 --- a/src/tests/kernel/boot_floppy/sockettest/Jamfile +++ b/src/tests/kernel/boot_floppy/sockettest/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps sockettest ; +SubDir OBOS_TOP src system apps sockettest ; KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ; diff --git a/src/tests/kernel/boot_floppy/testdigit/Jamfile b/src/tests/kernel/boot_floppy/testdigit/Jamfile index f4111d01a2..4a77daa68e 100644 --- a/src/tests/kernel/boot_floppy/testdigit/Jamfile +++ b/src/tests/kernel/boot_floppy/testdigit/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps testdigit ; +SubDir OBOS_TOP src system apps testdigit ; KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ; diff --git a/src/tests/kernel/boot_floppy/tests/Jamfile b/src/tests/kernel/boot_floppy/tests/Jamfile index e2c266bbd3..92ac1950b3 100644 --- a/src/tests/kernel/boot_floppy/tests/Jamfile +++ b/src/tests/kernel/boot_floppy/tests/Jamfile @@ -13,7 +13,7 @@ KernelLd thread_test : <$(SOURCE_GRIST)>thread_test.o libroot.so : - $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : @@ -25,7 +25,7 @@ KernelLd fops_test : <$(SOURCE_GRIST)>fops_test.o libroot.so : - $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : @@ -37,7 +37,7 @@ KernelLd random_test : <$(SOURCE_GRIST)>random_test.o libroot.so : - $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld : : : diff --git a/src/tests/kernel/core/cache/Jamfile b/src/tests/kernel/core/cache/Jamfile index 2f02dc6dd2..43844d5f5e 100644 --- a/src/tests/kernel/core/cache/Jamfile +++ b/src/tests/kernel/core/cache/Jamfile @@ -1,12 +1,12 @@ SubDir OBOS_TOP src tests kernel core cache ; -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core cache ] ; -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel cache ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel util ] ; UsePrivateHeaders kernel ; UsePrivateHeaders [ FDirName kernel arch $(OBOS_ARCH) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; -UseHeaders [ FDirName $(OBOS_TOP) src kernel core cache ] ; +UseHeaders [ FDirName $(OBOS_TOP) src system kernel cache ] ; StdBinCommands cache_control.cpp diff --git a/src/tests/kernel/core/disk_device_manager/Jamfile b/src/tests/kernel/core/disk_device_manager/Jamfile index cc7c5ec792..49dc000ca2 100644 --- a/src/tests/kernel/core/disk_device_manager/Jamfile +++ b/src/tests/kernel/core/disk_device_manager/Jamfile @@ -1,8 +1,8 @@ SubDir OBOS_TOP src tests kernel core disk_device_manager ; -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager jobs ] ; -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ; -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core fs ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel disk_device_manager jobs ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel fs ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kits storage ] ; # DiskDeviceTypes.cpp @@ -16,7 +16,7 @@ UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders storage ; UsePrivateHeaders kernel ; -UseHeaders [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ; +UseHeaders [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ; # As long as we compile for R5 userland, we define the following macros. SubDirCcFlags [ FDefines USER R5_MEMORY_LAYOUT ] ; diff --git a/src/tests/kernel/libroot/os/Jamfile b/src/tests/kernel/libroot/os/Jamfile index 67f3f8d9c4..a5d72774c9 100644 --- a/src/tests/kernel/libroot/os/Jamfile +++ b/src/tests/kernel/libroot/os/Jamfile @@ -17,4 +17,4 @@ SimpleTest FindDirectoryTest SEARCH on [ FGristFiles driver_settings.c parsedate.cpp - ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot os ] ; diff --git a/src/tests/kernel/libroot/posix/Jamfile b/src/tests/kernel/libroot/posix/Jamfile index 717d23a5c1..647592dfbb 100644 --- a/src/tests/kernel/libroot/posix/Jamfile +++ b/src/tests/kernel/libroot/posix/Jamfile @@ -15,6 +15,6 @@ SimpleTest flock_test # Tell Jam where to find these sources SEARCH on [ FGristFiles syslog.cpp - ] = [ FDirName $(OBOS_TOP) src kernel libroot posix ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot posix ] ; SubInclude OBOS_TOP src tests kernel libroot posix bonnie ; diff --git a/src/tests/kernel/vm2/Jamfile b/src/tests/kernel/vm2/Jamfile index a3d85e0ac7..199b4720a1 100644 --- a/src/tests/kernel/vm2/Jamfile +++ b/src/tests/kernel/vm2/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel vm2 tests ; +SubDir OBOS_TOP src system vm2 tests ; UseHeaders .. ; BinCommand vmTest : test.C : root be libvm.so ;