Partition modules are now built in their own static library file. Since

only the ones actually used are linked in, the local variable is no longer
used.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4588 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-09-09 02:16:40 +00:00
parent fd5b59d227
commit c55a2656e5
+14 -19
View File
@@ -1,6 +1,6 @@
SubDir OBOS_TOP src kernel boot loader ; SubDir OBOS_TOP src kernel boot loader ;
SubDirHdrs $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ; # SubDirHdrs $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ;
UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName storage ] ; UsePrivateHeaders [ FDirName storage ] ;
@@ -11,6 +11,8 @@ UsePrivateHeaders [ FDirName storage ] ;
BOOT_SUPPORT_PARTITION_AMIGA BOOT_SUPPORT_PARTITION_AMIGA
BOOT_SUPPORT_PARTITION_APPLE BOOT_SUPPORT_PARTITION_APPLE
BOOT_SUPPORT_PARTITION_INTEL BOOT_SUPPORT_PARTITION_INTEL
BOOT_SUPPORT_FILE_SYSTEM_BFS
; ;
defines = [ FDefines $(defines) ] ; defines = [ FDefines $(defines) ] ;
@@ -21,16 +23,11 @@ UsePrivateHeaders [ FDirName storage ] ;
KernelStaticLibrary boot_loader : KernelStaticLibrary boot_loader :
main.cpp main.cpp
vfs.cpp vfs.cpp
RootFileSystem.cpp
partitions.cpp partitions.cpp
heap.cpp heap.cpp
stdio.cpp stdio.cpp
# partition modules
amiga_rdb.cpp
apple.cpp
intel.cpp
PartitionMap.cpp
# utils # utils
list.c list.c
kernel_cpp.cpp kernel_cpp.cpp
@@ -38,18 +35,16 @@ KernelStaticLibrary boot_loader :
-fno-builtin -fno-builtin
; ;
# The following is a try to make the actual partition support # The partition support is built in an extra static library
# really configurable somewhere and let the build independent # so that only the ones that are used will be included.
# from it:
#local boot_partition_support = KernelStaticLibrary boot_partitions :
# amiga_rdb.cpp amiga_rdb.cpp
# ; apple.cpp
# intel.cpp
#KernelStaticLibrary boot_loader_partition : PartitionMap.cpp
# $(boot_partition_support) :
# : ;
# ;
# Tell Jam where to find the utility sources # Tell Jam where to find the utility sources
SEARCH on [ FGristFiles kernel_cpp.cpp list.c ] SEARCH on [ FGristFiles kernel_cpp.cpp list.c ]
@@ -67,5 +62,5 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp ]
SEARCH on [ FGristFiles stage2_crt0.S ] SEARCH on [ FGristFiles stage2_crt0.S ]
= [ FDirName $(OBOS_TOP) src kernel boot arch $(OBOS_ARCH) ] ; = [ FDirName $(OBOS_TOP) src kernel boot arch $(OBOS_ARCH) ] ;
# SubInclude OBOS_TOP src kernel boot loader partition ;
SubInclude OBOS_TOP src kernel boot loader file_systems ;