From 8e8869a9166646673133c562b9e009536ba9ba9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Thu, 20 Feb 2014 17:10:37 +0100
Subject: [PATCH] Fix more Freetype build feature dependencies in app_server

---
 src/servers/app/Jamfile       |  6 ++---
 src/tests/servers/app/Jamfile | 41 +++++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 43687fe8fc..f9a39b1a4f 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -33,9 +33,9 @@ local font_src =
 UseBuildFeatureHeaders freetype ;
 Includes [ FGristFiles AppServer.cpp BitmapManager.cpp
 	ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
-	DrawState.cpp DrawingContext.cpp ServerApp.cpp ServerBitmap.cpp
-	ServerCursor.cpp ServerFont.cpp ServerPicture.cpp ServerWindow.cpp
-	View.cpp Window.cpp WorkspacesView.cpp
+	DrawState.cpp DrawingContext.cpp DrawingEngine.cpp ServerApp.cpp 
+	ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp 
+	ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
 	$(decorator_src) $(font_src) ]
 	: [ BuildFeatureAttribute freetype : headers ] ;
 
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 3024af6914..cb7ae73adf 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -75,6 +75,24 @@ SharedLibrary libhwinterfaceimpl.so :
 	: libhwinterface.so
 ;
 
+local decorator_src =
+	DecorManager.cpp
+	Decorator.cpp
+	DefaultDecorator.cpp
+	DefaultWindowBehaviour.cpp
+	MagneticBorder.cpp
+	WindowBehaviour.cpp
+	;
+
+local font_src =
+	FontCache.cpp
+	FontCacheEntry.cpp
+	FontEngine.cpp
+	FontFamily.cpp
+	FontManager.cpp
+	FontStyle.cpp
+	;
+
 # These files are shared between the test_app_server and the libhwintreface, so
 # they can talk together.
 SharedLibrary libtestappserver.so :
@@ -87,12 +105,7 @@ SharedLibrary libtestappserver.so :
 	DirectWindowInfo.cpp
 	DrawingEngine.cpp
 	DrawState.cpp
-	FontCache.cpp
-	FontCacheEntry.cpp
-	FontEngine.cpp
-	FontFamily.cpp
-	FontManager.cpp
-	FontStyle.cpp
+	$(font_src)
 	GlobalSubpixelSettings.cpp
 	HashTable.cpp
 	IntPoint.cpp
@@ -117,12 +130,7 @@ SharedLibrary libtestappserver.so :
 	MessageLooper.cpp
 
 	# Decorator
-	Decorator.cpp
-	DecorManager.cpp
-	DefaultDecorator.cpp
-	DefaultWindowBehaviour.cpp
-	MagneticBorder.cpp
-	WindowBehaviour.cpp
+	$(decorator_src)
 
 	# Manager Classes
 	BitmapManager.cpp
@@ -171,6 +179,15 @@ SharedLibrary libtestappserver.so :
 	[ BuildFeatureAttribute freetype : library ]
 ;
 
+Includes [ FGristFiles AppServer.cpp BitmapManager.cpp
+	ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
+	DrawState.cpp DrawingContext.cpp DrawingEngine.cpp ServerApp.cpp 
+	ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp 
+	ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
+	$(decorator_src) $(font_src) ]
+	: [ BuildFeatureAttribute freetype : headers ] ;
+
+
 AddResources test_app_server : test_app_server.rdef ;
 
 Server test_app_server :