From 7c49936aa628627720bb86f3a5d2bc28940fd7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Tue, 15 Feb 2005 22:27:58 +0000
Subject: [PATCH] Simplified pci bus manager Jamfiles

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11384 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/bus_managers/pci/Jamfile   | 21 +++++--------------
 .../kernel/bus_managers/pci/arch/ppc/Jamfile  | 10 ++++-----
 .../kernel/bus_managers/pci/arch/x86/Jamfile  | 13 ++++++------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/add-ons/kernel/bus_managers/pci/Jamfile b/src/add-ons/kernel/bus_managers/pci/Jamfile
index 088f0b273d..b7fdf02659 100644
--- a/src/add-ons/kernel/bus_managers/pci/Jamfile
+++ b/src/add-ons/kernel/bus_managers/pci/Jamfile
@@ -3,29 +3,18 @@ SubDir OBOS_TOP src add-ons kernel bus_managers pci ;
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
 
-KernelMergeObject pci_bus_manager.o : 
+KernelAddon pci : kernel bus_managers :
+	pci.cpp
+	pci_info.cpp
+	pci_module.c
 	kernel_cpp.cpp
-	<$(SOURCE_GRIST)>pci.cpp
-	<$(SOURCE_GRIST)>pci_info.cpp
-	<$(SOURCE_GRIST)>pci_module.c
-	:
-	-fno-pic -Wno-unused -D_KERNEL_MODE
+	: pci_arch_bus_manager.a
 	;
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp 
 	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
 
-KernelLd pci :
-	pci_bus_manager.o
-	pci_arch_$(OBOS_ARCH)_bus_manager.o
-	kernel.so
-	:
-	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
-	:
-	-Bdynamic -shared
-	;
-
 # pci_info.cpp currently needs pcihdr.h so we make its path available
 ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ]
 	: [ FDirName $(OBOS_TOP) src prefs devices ] ;
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 b8f0fcb93d..753d23132f 100644
--- a/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile
+++ b/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile
@@ -1,9 +1,7 @@
 SubDir OBOS_TOP src add-ons kernel bus_managers pci arch ppc ;
 
-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
+KernelStaticLibrary pci_arch_bus_manager :
+	pci_config.c
+	pci_io.c
+	pci_irq.c
 	;
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 aeb0a046e8..4e3ff98549 100644
--- a/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile
+++ b/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile
@@ -1,10 +1,9 @@
 SubDir OBOS_TOP src add-ons kernel bus_managers pci arch x86 ;
 
-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
+KernelStaticLibrary pci_arch_bus_manager : 
+	bios.c
+	pci_config.c
+	pci_io.c
+	pci_irq.c
 	;
+