Bug 432293 Non-browser apps shouldn't need to build xpfe/components/history/public. r=ted,sr=Neil
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 03 Jun 2008 10:16:40 +0100
changeset 15216 ec130a95b7bcada2f262801de666c6ebb43f2099
parent 15215 af9466a5c157511c4bd35b99f8eee007dd01ed6f
child 15217 4157b3484b8ecb5908c479b3523359a1c846f63b
push idunknown
push userunknown
push dateunknown
reviewersted, Neil
bugs432293
milestone1.9.1a1pre
Bug 432293 Non-browser apps shouldn't need to build xpfe/components/history/public. r=ted,sr=Neil
xpfe/browser/src/nsBrowserInstance.cpp
xpfe/components/Makefile.in
--- a/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/xpfe/browser/src/nsBrowserInstance.cpp
@@ -80,28 +80,26 @@
 #include "nsIServiceManager.h"
 #include "nsIURL.h"
 #include "nsIIOService.h"
 #include "nsIWidget.h"
 #include "plstr.h"
 
 #include "nsIAppStartup.h"
 
-#ifdef MOZ_XUL
-#include "nsIBrowserHistory.h"
-#endif
 #include "nsDocShellCID.h"
 
 #include "nsIObserverService.h"
 
 #include "nsILocalFile.h"
 #include "nsDirectoryServiceDefs.h"
 
 #include "nsNetUtil.h"
 #ifndef MOZ_XUL_APP
+#include "nsIBrowserHistory.h"
 #include "nsICmdLineService.h"
 #endif
 
 // Stuff to implement file download dialog.
 #include "nsIProxyObjectManager.h" 
 
 #include "nsXPFEComponentsCID.h"
 
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -109,17 +109,16 @@ endif
 # build should be last
 DIRS += build
 
 else
 # !MOZ_HAVE_BROWSER
 
 DIRS += \
         autocomplete \
-        history/public \
         $(NULL)
 
 endif
 
 ifndef MOZ_XUL_APP
 ifdef MOZ_ENABLE_XREMOTE
 TOOL_DIRS += xremote
 endif