From 2b5cce91633654472b98b26bddf838fe868bfcea Mon Sep 17 00:00:00 2001
From: shatty <shatty@nowhere.fake>
Date: Thu, 18 Dec 2003 16:51:26 +0000
Subject: [PATCH] globals patch applied to matrox and globals dependent include
 removed from all engine Jamfiles

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5706 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/accelerants/matrox/Jamfile          | 1 -
 src/add-ons/accelerants/matrox/acc_std.h        | 2 +-
 src/add-ons/accelerants/matrox/engine/Jamfile   | 2 +-
 src/add-ons/accelerants/matrox/engine/mga_std.h | 2 +-
 src/add-ons/accelerants/neomagic/Jamfile        | 4 ++++
 src/add-ons/accelerants/neomagic/engine/Jamfile | 1 -
 src/add-ons/accelerants/nvidia/Jamfile          | 4 ++++
 src/add-ons/accelerants/nvidia/engine/Jamfile   | 1 -
 8 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/accelerants/matrox/Jamfile b/src/add-ons/accelerants/matrox/Jamfile
index b6b43847a8..779ef3b5f2 100644
--- a/src/add-ons/accelerants/matrox/Jamfile
+++ b/src/add-ons/accelerants/matrox/Jamfile
@@ -13,7 +13,6 @@ Addon mga.accelerant : accelerants :
 	GetDeviceInfo.c
 	GetModeInfo.c
 	GetTimingConstraints.c
-	GlobalData.c
 	InitAccelerant.c
 	Overlay.c
 	ProposeDisplayMode.c
diff --git a/src/add-ons/accelerants/matrox/acc_std.h b/src/add-ons/accelerants/matrox/acc_std.h
index d6718968cf..77b5963486 100644
--- a/src/add-ons/accelerants/matrox/acc_std.h
+++ b/src/add-ons/accelerants/matrox/acc_std.h
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include "DriverInterface.h"
-#include "global.h"
+#include "mga_globals.h"
 //apsed #include "mga_extern.h"
 #include "mga_proto.h"
 #include "be_driver_proto.h"
diff --git a/src/add-ons/accelerants/matrox/engine/Jamfile b/src/add-ons/accelerants/matrox/engine/Jamfile
index 5ac0a0653e..0107b7d9f1 100644
--- a/src/add-ons/accelerants/matrox/engine/Jamfile
+++ b/src/add-ons/accelerants/matrox/engine/Jamfile
@@ -2,7 +2,6 @@ SubDir OBOS_TOP src add-ons accelerants matrox engine ;
 
 UsePrivateHeaders graphics ;
 UsePrivateHeaders [ FDirName graphics matrox ] ;
-UseHeaders [ FDirName $(SUBDIR) .. ] ;
 
 StaticLibrary matrox_engine :
 	mga_acc.c
@@ -11,6 +10,7 @@ StaticLibrary matrox_engine :
 	mga_crtc2.c
 	mga_dac.c
 	mga_general.c
+	mga_globals.c
 	mga_i2c.c
 	mga_info.c
 	mga_maven.c
diff --git a/src/add-ons/accelerants/matrox/engine/mga_std.h b/src/add-ons/accelerants/matrox/engine/mga_std.h
index bfffb19902..af5555b8c9 100644
--- a/src/add-ons/accelerants/matrox/engine/mga_std.h
+++ b/src/add-ons/accelerants/matrox/engine/mga_std.h
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <OS.h>
 #include "DriverInterface.h"
-#include "global.h"
+#include "mga_globals.h"
 //apsed #include "mga_extern.h"
 #include "mga_proto.h"
 #include "mga_macros.h"
diff --git a/src/add-ons/accelerants/neomagic/Jamfile b/src/add-ons/accelerants/neomagic/Jamfile
index af0bfff7b4..4f7c6a77b5 100644
--- a/src/add-ons/accelerants/neomagic/Jamfile
+++ b/src/add-ons/accelerants/neomagic/Jamfile
@@ -20,6 +20,10 @@ Addon nm.accelerant : accelerants :
 	: false : libneomagic_engine.a
 ;
 
+Package openbeos-neomagic-1.0 :
+	nm.accelerant :
+	boot home config add-ons accelerants ;
+
 Depends nm.accelerant : nm.driver ;
 
 SubInclude OBOS_TOP src add-ons accelerants neomagic engine ;
diff --git a/src/add-ons/accelerants/neomagic/engine/Jamfile b/src/add-ons/accelerants/neomagic/engine/Jamfile
index 1c098c6117..8fae50c3e7 100644
--- a/src/add-ons/accelerants/neomagic/engine/Jamfile
+++ b/src/add-ons/accelerants/neomagic/engine/Jamfile
@@ -2,7 +2,6 @@ SubDir OBOS_TOP src add-ons accelerants neomagic engine ;
 
 UsePrivateHeaders graphics ;
 UsePrivateHeaders [ FDirName graphics neomagic ] ;
-UseHeaders [ FDirName $(SUBDIR) .. ] ;
 
 StaticLibrary neomagic_engine :
 	nm_acc.c
diff --git a/src/add-ons/accelerants/nvidia/Jamfile b/src/add-ons/accelerants/nvidia/Jamfile
index 777b1bc485..63515ff2a6 100644
--- a/src/add-ons/accelerants/nvidia/Jamfile
+++ b/src/add-ons/accelerants/nvidia/Jamfile
@@ -20,6 +20,10 @@ Addon nv.accelerant : accelerants :
 	: false : libnvidia_engine.a
 ;
 
+Package openbeos-nvidia-1.0 :
+	nv.accelerant : 
+	boot home config add-ons accelerants ;
+
 Depends nv.accelerant : nv.driver ;
 
 SubInclude OBOS_TOP src add-ons accelerants nvidia engine ;
diff --git a/src/add-ons/accelerants/nvidia/engine/Jamfile b/src/add-ons/accelerants/nvidia/engine/Jamfile
index ed5f4eb23a..be6808460b 100644
--- a/src/add-ons/accelerants/nvidia/engine/Jamfile
+++ b/src/add-ons/accelerants/nvidia/engine/Jamfile
@@ -2,7 +2,6 @@ SubDir OBOS_TOP src add-ons accelerants nvidia engine ;
 
 UsePrivateHeaders graphics ;
 UsePrivateHeaders [ FDirName graphics nvidia ] ;
-UseHeaders [ FDirName $(SUBDIR) .. ] ;
 
 StaticLibrary nvidia_engine :
 	nv_acc.c