diff --git a/build/jam/FileRules b/build/jam/FileRules index c66230a231..f25319ba51 100644 --- a/build/jam/FileRules +++ b/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 ] ; - } -} diff --git a/build/jam/HeadersRules b/build/jam/HeadersRules index 652c73a2bd..e7490235d6 100644 --- a/build/jam/HeadersRules +++ b/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 diff --git a/headers/shared/AboutWindow.h b/headers/shared/AboutWindow.h deleted file mode 100644 index 57cf972db8..0000000000 --- a/headers/shared/AboutWindow.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * Authors: - * Ryan Leavengood, leavengood@gmail.com - */ -#ifndef B_ABOUT_WINDOW_H -#define B_ABOUT_WINDOW_H - - -#include - - -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 diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index 1684c91ea3..59c94aaada 100644 --- a/src/apps/showimage/Jamfile +++ b/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 ; diff --git a/src/apps/showimage/ShowImageApp.cpp b/src/apps/showimage/ShowImageApp.cpp index c5e2d139ae..60fc31b3ea 100644 --- a/src/apps/showimage/ShowImageApp.cpp +++ b/src/apps/showimage/ShowImageApp.cpp @@ -10,11 +10,11 @@ */ -#include "AboutWindow.h" // Shared source #include "ShowImageApp.h" #include "ShowImageConstants.h" #include "ShowImageWindow.h" +#include #include #include #include diff --git a/src/shared/AboutWindow.cpp b/src/shared/AboutWindow.cpp index 2b014f1a19..934063c561 100644 --- a/src/shared/AboutWindow.cpp +++ b/src/shared/AboutWindow.cpp @@ -6,8 +6,7 @@ * Ryan Leavengood, leavengood@gmail.com */ -#include "AboutWindow.h" - +#include #include #include #include