Cleanup app server directory a bit by creating a font and a decorator sub folder.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42483 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/decorators/SATDecorator/Jamfile

@@ -4,6 +4,8 @@ UseLibraryHeaders agg lp_solve linprog ;
 UsePrivateHeaders app graphics interface shared kernel ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
 UseFreeTypeHeaders ;

src/servers/app/Desktop.cpp

@@ -40,6 +40,7 @@
 #include "DecorManager.h"
 #include "DesktopSettingsPrivate.h"
 #include "DrawingEngine.h"
+#include "FontManager.h"
 #include "HWInterface.h"
 #include "InputManager.h"
 #include "Screen.h"

src/servers/app/DrawState.h

@@ -17,7 +17,6 @@
 #include <Point.h>
 #include <View.h> // for B_FONT_ALL
 
-#include "FontManager.h"
 #include "ServerFont.h"
 #include "PatternHandler.h"
 

src/servers/app/Jamfile

@@ -8,6 +8,26 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
 UseFreeTypeHeaders ;
 
 
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
+local decorator_src =
+	DecorManager.cpp
+	Decorator.cpp
+	DefaultDecorator.cpp
+	DefaultWindowBehaviour.cpp
+	MagneticBorder.cpp
+	WindowBehaviour.cpp
+	;
+
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
+local font_src =
+	FontCache.cpp
+	FontCacheEntry.cpp
+	FontEngine.cpp
+	FontFamily.cpp
+	FontManager.cpp
+	FontStyle.cpp
+	;
+
 Server app_server :
 	Angle.cpp
 	AppServer.cpp
@@ -18,10 +38,6 @@ Server app_server :
 	CursorData.cpp
 	CursorManager.cpp
 	CursorSet.cpp
-	DecorManager.cpp
-	Decorator.cpp
-	DefaultDecorator.cpp
-	DefaultWindowBehaviour.cpp
 	Desktop.cpp
 	DesktopListener.cpp
 	DesktopSettings.cpp
@@ -29,17 +45,10 @@ Server app_server :
 	DrawState.cpp
 	EventDispatcher.cpp
 	EventStream.cpp
-	FontCache.cpp
-	FontCacheEntry.cpp
-	FontEngine.cpp
-	FontFamily.cpp
-	FontManager.cpp
-	FontStyle.cpp
 	HashTable.cpp
 	InputManager.cpp
 	IntPoint.cpp
 	IntRect.cpp
-	MagneticBorder.cpp
 	MessageLooper.cpp
 	MultiLocker.cpp
 	OffscreenServerWindow.cpp
@@ -60,11 +69,13 @@ Server app_server :
 	View.cpp
 	VirtualScreen.cpp
 	Window.cpp
-	WindowBehaviour.cpp
 	WindowList.cpp
 	Workspace.cpp
 	WorkspacesView.cpp
 
+	$(decorator_src)
+	$(font_src)
+
 	# libraries
 	:
 	libtranslation.so libbe.so libbnetapi.so
@@ -74,4 +85,8 @@ Server app_server :
 	: app_server.rdef
 ;
 
+SEARCH on [ FGristFiles $(decorator_src) ] = [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
+SEARCH on [ FGristFiles $(font_src) ] = [ FDirName $(HAIKU_TOP) src servers app font ] ;
+
+
 SubInclude HAIKU_TOP src servers app drawing ;

src/servers/app/ServerPicture.cpp

@@ -16,6 +16,7 @@
 
 #include "DrawingEngine.h"
 #include "DrawState.h"
+#include "FontManager.h"
 #include "ServerApp.h"
 #include "ServerBitmap.h"
 #include "ServerFont.h"

src/servers/app/drawing/Jamfile

@@ -6,6 +6,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 UsePrivateSystemHeaders ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;

src/servers/app/drawing/Painter/Jamfile

@@ -6,6 +6,7 @@ AddSubDirSupportedPlatforms libbe_test ;
 UseLibraryHeaders agg ;
 UsePrivateHeaders app graphics interface kernel shared ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
 UseFreeTypeHeaders ;

src/servers/app/drawing/remote/Jamfile

@@ -6,6 +6,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 UsePrivateSystemHeaders ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;