From 321fcdaf57b630fc9fd9a45d9fd92cb3ba1d4cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 18 Jan 2005 16:37:49 +0000 Subject: [PATCH] Removed ToDo comment about removing kernel.so - actually, we'll keep kernel.so because it has some advantages over a relocatable kernel. Removed libbus.a as it's no longer needed. kernel.so now depends on kernel, so that both files are updated at once. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10834 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/Jamfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile index aee3e079a5..cddc06ffe8 100644 --- a/src/kernel/Jamfile +++ b/src/kernel/Jamfile @@ -59,7 +59,6 @@ KernelLd kernel : kernel_disk_device_manager.o kernel_util.o - libbus.a lib$(OBOS_ARCH).a libdrivers.a @@ -77,8 +76,6 @@ KernelLd kernel : ; KernelLd kernel.so : - # ToDo: remove kernel.so completely and make the drivers/modules - # linkable against the kernel itself kernel_core.o kernel_fs.o kernel_vm.o @@ -87,7 +84,6 @@ KernelLd kernel.so : kernel_disk_device_manager.o kernel_util.o - libbus.a lib$(OBOS_ARCH).a libdrivers.a @@ -414,6 +410,9 @@ BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ; KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(SUBDIR)/boot/arch/$(OBOS_ARCH)/bootblock.bin ; +Depends kernel.so : kernel ; + # kernel.so will be rebuilt with the kernel + Depends boot_floppy : $(OBOS_FLOPPY) ; NotFile boot_floppy ; Depends bootfloppy : $(OBOS_FLOPPY) ;