From 9effd7197519a58d60b5f676772865e2ec692f0c Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 13 Jul 2002 20:40:26 +0000
Subject: [PATCH] Added missing prefs applications to the build and fixed some
 smaller problems.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@183 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/prefs/Jamfile               |  6 ++++++
 src/prefs/drivesetup/Jamfile    |  2 +-
 src/prefs/fonts/Jamfile         |  2 +-
 src/prefs/keymap/Jamfile        |  2 +-
 src/prefs/media/Jamfile         |  2 +-
 src/prefs/screensaver/Jamfile   | 15 ++++++++++++---
 src/prefs/translation/Jamfile   |  2 +-
 src/prefs/virtualmemory/Jamfile |  2 +-
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/prefs/Jamfile b/src/prefs/Jamfile
index 135e0f63ae..f07eee7808 100644
--- a/src/prefs/Jamfile
+++ b/src/prefs/Jamfile
@@ -1,12 +1,18 @@
 SubDir OBOS_TOP src prefs ;
 
 SubInclude OBOS_TOP src prefs appearance ;
+SubInclude OBOS_TOP src prefs datatranslations ;
 SubInclude OBOS_TOP src prefs drivesetup ;
 SubInclude OBOS_TOP src prefs dun ;
 SubInclude OBOS_TOP src prefs fonts ;
 SubInclude OBOS_TOP src prefs keyboard ;
+SubInclude OBOS_TOP src prefs keymap ;
+SubInclude OBOS_TOP src prefs media ;
 SubInclude OBOS_TOP src prefs menu ;
+SubInclude OBOS_TOP src prefs mouse ;
 SubInclude OBOS_TOP src prefs print ;
 SubInclude OBOS_TOP src prefs screen ;
+SubInclude OBOS_TOP src prefs screensaver ;
+SubInclude OBOS_TOP src prefs translation ;
 SubInclude OBOS_TOP src prefs virtualmemory ;
 SubInclude OBOS_TOP src prefs workspaces ;
diff --git a/src/prefs/drivesetup/Jamfile b/src/prefs/drivesetup/Jamfile
index 3af3222101..03821c12d9 100644
--- a/src/prefs/drivesetup/Jamfile
+++ b/src/prefs/drivesetup/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src prefs drivesetup ;
 
-AddResources DriveSetup : Resource.rsrc ;
+AddResources DriveSetup : <$(SOURCE_GRIST)>Resource.rsrc ;
 
 Preference DriveSetup : main.cpp MainWindow.cpp PosSettings.cpp ;
 
diff --git a/src/prefs/fonts/Jamfile b/src/prefs/fonts/Jamfile
index 5e4b5e44cf..b98669cadc 100644
--- a/src/prefs/fonts/Jamfile
+++ b/src/prefs/fonts/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src prefs fonts ;
 
-AddResources Fonts : Resource.rsrc ;
+AddResources Fonts : <$(SOURCE_GRIST)>Resource.rsrc ;
 
 Preference Fonts :
 	ButtonView.cpp
diff --git a/src/prefs/keymap/Jamfile b/src/prefs/keymap/Jamfile
index 1a61afd7a5..46a87d2cb3 100644
--- a/src/prefs/keymap/Jamfile
+++ b/src/prefs/keymap/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src prefs keymap ;
 
-AddResources Keymap : Resource.rsrc ;
+#AddResources Keymap : <$(SOURCE_GRIST)>Resource.rsrc ;
 
 Preference Keymap :
 	main.cpp
diff --git a/src/prefs/media/Jamfile b/src/prefs/media/Jamfile
index d2b98be184..9453ea84ae 100644
--- a/src/prefs/media/Jamfile
+++ b/src/prefs/media/Jamfile
@@ -8,4 +8,4 @@ Preference Media :
 	MediaPrefsView.cpp
 	MediaPrefsSlider.cpp ;
 
-LinkSharedOSLibs Media : be media ;
\ No newline at end of file
+LinkSharedOSLibs Media : be libmedia.so ;
\ No newline at end of file
diff --git a/src/prefs/screensaver/Jamfile b/src/prefs/screensaver/Jamfile
index ecb4231072..aae1883d55 100644
--- a/src/prefs/screensaver/Jamfile
+++ b/src/prefs/screensaver/Jamfile
@@ -1,10 +1,19 @@
 SubDir OBOS_TOP src prefs screensaver ;
 
-Preference ScreenSaver :
+local sources =
 	OBOSScreenSaverPreferences.cpp
 	ScreenSaver.cpp
 	pwWindow.cpp
 	PreviewView.cpp
-	MouseAreaView.cpp ;
+	MouseAreaView.cpp
+;
+
+Preference ScreenSaver : $(sources) ;
+
+LinkSharedOSLibs ScreenSaver : be stdc++.r4 ;
+
+# Ugly hack: Prepend the dir containing Be's ScreenSaver.h to the list of
+# include search dirs. Otherwise it won't be found.
+# It is certainly a good idea to rename the local files.
+PrependObjectHdrs $(sources) : /boot/develop/headers/be/add-ons/screen_saver ;
 
-LinkSharedOSLibs ScreenSaver : be stdc++.r4 ;
\ No newline at end of file
diff --git a/src/prefs/translation/Jamfile b/src/prefs/translation/Jamfile
index 3be39319ec..7a6e76606d 100644
--- a/src/prefs/translation/Jamfile
+++ b/src/prefs/translation/Jamfile
@@ -7,4 +7,4 @@ Preference DataTranslations2 :
 	transwin.cpp
 	datatrans.cpp ;
 
-LinkSharedOSLibs DataTranslations2 : be translation ;
\ No newline at end of file
+LinkSharedOSLibs DataTranslations2 : be libtranslation.so ;
diff --git a/src/prefs/virtualmemory/Jamfile b/src/prefs/virtualmemory/Jamfile
index fa77158b99..3474803b8f 100644
--- a/src/prefs/virtualmemory/Jamfile
+++ b/src/prefs/virtualmemory/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src prefs virtualmemory ;
 
-AddResources VirtualMemory : Resource.rsrc ;
+AddResources VirtualMemory : <$(SOURCE_GRIST)>Resource.rsrc ;
 
 Preference VirtualMemory : main.cpp MainWindow.cpp VMSettings.cpp ;