From 92d054b3eaf82cf74ceb2723b7e57e04fcd88384 Mon Sep 17 00:00:00 2001 From: beveloper Date: Thu, 18 Sep 2003 12:53:12 +0000 Subject: [PATCH] now really creates the pci bus manager git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4754 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/pci/Jamfile | 10 ++++++---- .../kernel/bus_managers/pci/arch/ppc/Jamfile | 12 +++++++----- .../kernel/bus_managers/pci/arch/x86/Jamfile | 14 ++++++++------ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/pci/Jamfile b/src/add-ons/kernel/bus_managers/pci/Jamfile index 2bf3379d43..7d34211ed3 100644 --- a/src/add-ons/kernel/bus_managers/pci/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/Jamfile @@ -1,12 +1,14 @@ SubDir OBOS_TOP src add-ons kernel bus_managers pci ; -KernelStaticLibrary pci_bus_manager : - pci.c +KernelMergeObject pci_bus_manager.o : + <$(SOURCE_GRIST)>pci.c + : + -fno-pic -Wno-unused -D_KERNEL_MODE ; KernelLd pci : - pci_bus_manager.a - pci_arch_$(OBOS_ARCH)_bus_manager.a + pci_bus_manager.o + pci_arch_$(OBOS_ARCH)_bus_manager.o kernel.so : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld diff --git a/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile b/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile index 47ce443326..b8f0fcb93d 100644 --- a/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile @@ -1,7 +1,9 @@ SubDir OBOS_TOP src add-ons kernel bus_managers pci arch ppc ; -KernelStaticLibrary pci_arch_ppc_bus_manager : - pci_config.c - pci_io.c - pci_irq.c -; +KernelMergeObject pci_arch_ppc_bus_manager.o : + <$(SOURCE_GRIST)>pci_config.c + <$(SOURCE_GRIST)>pci_io.c + <$(SOURCE_GRIST)>pci_irq.c + : + -fno-pic -Wno-unused -D_KERNEL_MODE + ; diff --git a/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile b/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile index 34a56b7d3a..aeb0a046e8 100644 --- a/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile @@ -1,8 +1,10 @@ SubDir OBOS_TOP src add-ons kernel bus_managers pci arch x86 ; -KernelStaticLibrary pci_arch_x86_bus_manager : - bios.c - pci_config.c - pci_io.c - pci_irq.c -; +KernelMergeObject pci_arch_x86_bus_manager.o : + <$(SOURCE_GRIST)>bios.c + <$(SOURCE_GRIST)>pci_config.c + <$(SOURCE_GRIST)>pci_io.c + <$(SOURCE_GRIST)>pci_irq.c + : + -fno-pic -Wno-unused -D_KERNEL_MODE + ;