Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernelland_emu is now a shared rather than a static library. The userland versions of the kernel modules are now linked against it and not longer against DiskScannerTest.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2626 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2003-02-02 22:56:16 +00:00
parent f1c73c8c64
commit de40feed71
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tests/add-ons/kernel/Jamfile
View File

@ -1,7 +1,9 @@
SubDir OBOS_TOP src tests add-ons kernel ; SubDir OBOS_TOP src tests add-ons kernel ;
StaticLibrary kernelland_emu : kernelland_emu.cpp ; SharedLibrary kernelland_emu : kernelland_emu.cpp ;
#LinkSharedOSLibs libkernelland_emu.a : be stdc++.r4 ; LinkSharedOSLibs libkernelland_emu.so : be stdc++.r4 ;
AbsSymLink <boot!home!config!lib>libkernelland_emu.so : libkernelland_emu.so
: /boot/home/config/lib ;
SubInclude OBOS_TOP src tests add-ons kernel disk_scanner ; SubInclude OBOS_TOP src tests add-ons kernel disk_scanner ;
SubInclude OBOS_TOP src tests add-ons kernel file_systems ; SubInclude OBOS_TOP src tests add-ons kernel file_systems ;

6
src/tests/add-ons/kernel/disk_scanner/Jamfile
View File

@ -4,8 +4,9 @@ UsePrivateHeaders $(DOT) ;
# the test app # the test app
SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
SimpleTest DiskScannerTest : DiskScannerTest.cpp SimpleTest DiskScannerTest : DiskScannerTest.cpp
: libkernelland_emu.a be stdc++.r4 ; : <boot!home!config!lib>libkernelland_emu.so be stdc++.r4 ;
LOCATE on <installed>DiskScannerTest = [ on DiskScannerTest return $(LOCATE) ] ; LOCATE on <installed>DiskScannerTest = [ on DiskScannerTest return $(LOCATE) ] ;
Depends <installed>DiskScannerTest : DiskScannerTest ; Depends <installed>DiskScannerTest : DiskScannerTest ;
@ -22,8 +23,7 @@ SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel disk_scanner ] ;
Addon <userland>disk_scanner : userland disk_scanner : Addon <userland>disk_scanner : userland disk_scanner :
disk_scanner.c disk_scanner.c
; ;
#LinkSharedOSLibs <userland>disk_scanner : libkernelland_emu.so ; LinkSharedOSLibs <userland>disk_scanner : libkernelland_emu.so ;
LinkSharedOSLibs <userland>disk_scanner : <installed>DiskScannerTest ;
SubInclude OBOS_TOP src tests add-ons kernel disk_scanner fs ; SubInclude OBOS_TOP src tests add-ons kernel disk_scanner fs ;
SubInclude OBOS_TOP src tests add-ons kernel disk_scanner partition ; SubInclude OBOS_TOP src tests add-ons kernel disk_scanner partition ;

4
src/tests/add-ons/kernel/disk_scanner/fs/Jamfile
View File

@ -16,12 +16,12 @@ UsePrivateHeaders $(DOT) ;
Addon <userland>bfs : userland disk_scanner fs : Addon <userland>bfs : userland disk_scanner fs :
bfs.c bfs.c
; ;
LinkSharedOSLibs <userland>bfs : <installed>DiskScannerTest ; LinkSharedOSLibs <userland>bfs : libkernelland_emu.so ;
# iso9660 # iso9660
Addon <userland>iso9660 : userland disk_scanner fs : Addon <userland>iso9660 : userland disk_scanner fs :
iso9660.c iso9660.c
; ;
LinkSharedOSLibs <userland>iso9660 : <installed>DiskScannerTest ; LinkSharedOSLibs <userland>iso9660 : libkernelland_emu.so ;

2
src/tests/add-ons/kernel/disk_scanner/partition/Jamfile
View File

@ -16,4 +16,4 @@ UsePrivateHeaders $(DOT) ;
Addon <userland>intel : userland disk_scanner partition : Addon <userland>intel : userland disk_scanner partition :
intel.cpp intel_parameters.cpp intel_partition_map.cpp intel.cpp intel_parameters.cpp intel_partition_map.cpp
; ;
LinkSharedOSLibs <userland>intel : <installed>DiskScannerTest ; LinkSharedOSLibs <userland>intel : libkernelland_emu.so ;

2
src/tests/add-ons/kernel/disk_scanner/session/Jamfile
View File

@ -16,4 +16,4 @@ UsePrivateHeaders $(DOT) ;
Addon <userland>cdrom : userland disk_scanner session : Addon <userland>cdrom : userland disk_scanner session :
cdrom.c cdrom.c
; ;
LinkSharedOSLibs <userland>cdrom : <installed>DiskScannerTest ; LinkSharedOSLibs <userland>cdrom : libkernelland_emu.so ;