As I said I would:

1. Deleted headers/shared/
2. Added a Jamfile to src/shared to build it into a static library libshared.a.
3. Removed my changes in the build/jam directory.
4. Have ShowImage include libshared.a.

I forgot to add AboutWindow.h to headers/private/shared. I will do that next.



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

build/jam/FileRules

@@ -250,14 +250,3 @@ actions CopySetHaikuRevision1
 	$(2[2]) $(1) ${revision}
 }
 
-rule UseSharedSource
-{
-	UseSharedHeaders ;
-
-	for file in $(1) {
-		local gristed_file = [ FGristFiles $(file) ] ;
-		SEARCH on $(gristed_file) = [ FDirName $(HAIKU_TOP) src shared ] ;
-		LOCATE on $(gristed_file) = [ FDirName $(HAIKU_TOP) src shared ] ;
-		SEARCH_SOURCE on $(gristed_file) = [ FDirName $(HAIKU_TOP) src shared ] ;
-	}
-}

build/jam/HeadersRules

@@ -338,11 +338,6 @@ rule UseLegacyObjectHeaders
 	SourceSysHdrs $(1) : [ FDirName $(HAIKU_TOP) headers legacy ] : $(2) ;
 }
 
-rule UseSharedHeaders
-{
-	UseHeaders [ FDirName $(HAIKU_TOP) headers shared ] ;
-}
-
 rule FStandardOSHeaders
 {
 	local osIncludes = add-ons add-ons/file_system add-ons/graphics

headers/shared/AboutWindow.h

@@ -1,28 +0,0 @@
-/*
- * Copyright 2007 Haiku, Inc.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Ryan Leavengood, [email protected]
- */
-#ifndef B_ABOUT_WINDOW_H
-#define B_ABOUT_WINDOW_H
-
-
-#include <String.h>
-
-
-class BAboutWindow {
-	public:
-		BAboutWindow(char *appName, int32 firstCopyrightYear,
-			const char **authors, char *extraInfo = NULL);
-		virtual ~BAboutWindow();
-
-		void Show();
-
-	private:
-		BString* 		fAppName;
-		BString*		fText;
-};
-
-#endif	// B_ABOUT_WINDOW_H

src/apps/showimage/Jamfile

@@ -1,13 +1,10 @@
 SubDir HAIKU_TOP src apps showimage ;
 
-UsePrivateHeaders tracker ;
+UsePrivateHeaders tracker shared ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UseSharedSource AboutWindow.cpp ;
-
 Application ShowImage :
-	AboutWindow.cpp
 	ShowImageApp.cpp
 	ShowImageSettings.cpp
 	ShowImageStatusView.cpp
@@ -20,7 +17,8 @@ Application ShowImage :
 	BackgroundImage.cpp
 	ProgressWindow.cpp
 	ResizerWindow.cpp
-	: be tracker translation
+	: libshared.a
+	be tracker translation
 	: ShowImage.rdef
 	;
 

src/apps/showimage/ShowImageApp.cpp

@@ -10,11 +10,11 @@
  */
 
 
-#include "AboutWindow.h" // Shared source
 #include "ShowImageApp.h"
 #include "ShowImageConstants.h"
 #include "ShowImageWindow.h"
 
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Clipboard.h>
 #include <FilePanel.h>

src/shared/AboutWindow.cpp

@@ -6,8 +6,7 @@
  *		Ryan Leavengood, [email protected]
  */
 
-#include "AboutWindow.h"
+#include <AboutWindow.h>
-
 #include <Alert.h>
 #include <Font.h>
 #include <String.h>