--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -68,21 +68,17 @@ static RedirEntry kRedirMap[] = {
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
{ "mozilla", "chrome://global/content/mozilla.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
{ "plugins", "chrome://global/content/plugins.html", 0 },
{ "config", "chrome://global/content/config.xul", 0 },
#ifdef MOZ_CRASHREPORTER
{ "crashes", "chrome://global/content/crashes.xhtml", 0 },
#endif
-#ifdef MOZ_XUL_APP
{ "logo", "chrome://branding/content/about.png",
-#else
- { "logo", "chrome://global/content/logo.gif",
-#endif
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
{ "buildconfig", "chrome://global/content/buildconfig.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
{ "license", "chrome://global/content/license.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
{ "licence", "chrome://global/content/license.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
{ "about", "chrome://global/content/aboutAbout.html", 0 },
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -43,20 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = embed
PACKAGE_FILE = embed.pkg
DIRS = base components browser
-ifndef MOZ_XUL_APP
-DIRS += lite
-endif
-
ifdef ENABLE_TESTS
XPCSHELL_TESTS = tests/unit
endif
ifdef MOZ_MOCHITEST
DIRS += test
endif
--- a/embedding/browser/Makefile.in
+++ b/embedding/browser/Makefile.in
@@ -39,19 +39,16 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = webBrowser build
-ifndef MOZ_XUL_APP
-DIRS += chrome
-endif
ifeq ($(OS_ARCH),WINNT)
ifndef MOZ_NO_ACTIVEX_SUPPORT
TOOL_DIRS += activex/src
endif
endif
include $(topsrcdir)/config/rules.mk
--- a/embedding/tests/Makefile.in
+++ b/embedding/tests/Makefile.in
@@ -37,16 +37,14 @@ include $(DEPTH)/config/autoconf.mk
ifeq ($(OS_ARCH),OS2)
DIRS = os2Embed
endif
ifeq ($(OS_ARCH),WINNT)
# disable winembed in non-libxul
ifndef BUILD_STATIC_LIBS
-ifdef MOZ_XUL_APP
DIRS = winEmbed
endif
-endif
endif
include $(topsrcdir)/config/rules.mk
--- a/embedding/tests/os2Embed/Makefile.in
+++ b/embedding/tests/os2Embed/Makefile.in
@@ -97,19 +97,17 @@ endif
ifdef BUILD_STATIC_LIBS
include $(topsrcdir)/config/static-config.mk
EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
EXTRA_LIBS += -L$(DEPTH)/dist/lib/components
EXTRA_LIBS += $(EXTRA_DSO_LIBS) $(STATIC_EXTRA_LIBS)
-ifdef MOZ_XUL_APP
EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
-endif # MOZ_XUL_APP
DEFINES += $(STATIC_DEFINES)
CPPSRCS += $(STATIC_CPPSRCS)
endif # BUILD_STATIC_LIBS
include $(topsrcdir)/config/rules.mk
--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@@ -61,20 +61,16 @@ REQUIRES = xpcom \
layout \
widget \
locale \
view \
pref \
toolkitcomps \
$(NULL)
-ifndef MOZ_XUL_APP
-REQUIRES += appcomps
-endif
-
XPIDLSRCS = \
nsILayoutRegressionTester.idl \
nsILayoutDebuggingTools.idl \
$(NULL)
EXPORTS = \
nsLayoutDebugCIID.h \
$(NULL)
--- a/extensions/pref/autoconfig/Makefile.in
+++ b/extensions/pref/autoconfig/Makefile.in
@@ -38,12 +38,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = autoconfig
-DIRS = public resources src
+DIRS = public src
include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -49,33 +49,30 @@ REQUIRES = xpcom \
string \
uconv \
unicharutil \
spellchecker \
xulapp \
$(NULL)
CPPSRCS = mozHunspell.cpp \
+ mozHunspellDirProvider.cpp \
$(NULL)
ifndef MOZ_NATIVE_HUNSPELL
CPPSRCS += affentry.cpp \
affixmgr.cpp \
csutil.cpp \
hashmgr.cpp \
hunspell.cpp \
phonet.cpp \
suggestmgr.cpp \
$(NULL)
endif
-ifdef MOZ_XUL_APP
-CPPSRCS += mozHunspellDirProvider.cpp
-endif
-
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_HUNSPELL_LIBS) \
$(NULL)
--- a/extensions/widgetutils/Makefile.in
+++ b/extensions/widgetutils/Makefile.in
@@ -4,30 +4,28 @@ topsrcdir=@top_srcdir@
srcdir=@srcdir@
VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = widgetutils
XPI_NAME = widgetutils
-ifdef MOZ_XUL_APP
INSTALL_EXTENSION_ID = widgetutils@extensions.mozilla.org
DIST_FILES = install.rdf
NO_JAR_AUTO_REG = 1
USE_EXTENSION_MANIFEST = 1
XPI_PKGNAME = widgetutils-$(MOZ_APP_VERSION)
XULAPP_DEFINES = \
-DFIREFOX_VERSION=$(FIREFOX_VERSION) \
-DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
-DEXTENSION_VERSION=$(MOZILLA_VERSION) \
$(NULL)
ifdef TARGET_XPCOM_ABI
XULAPP_DEFINES += -DEM_ABI=$(OS_TARGET)_$(TARGET_XPCOM_ABI)
endif
-endif
DIRS = src
#DIRS += public
include $(topsrcdir)/config/rules.mk
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -50,17 +50,16 @@ DIRS = \
dns \
socket \
mime \
streamconv \
cache \
protocol \
system \
build \
- resources \
locales \
$(NULL)
ifdef ENABLE_TESTS
TOOL_DIRS += test
endif
EXPORTS = necko-config.h
--- a/security/manager/ssl/Makefile.in
+++ b/security/manager/ssl/Makefile.in
@@ -37,13 +37,13 @@
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MODULE = pipnss
-DIRS = resources src public
+DIRS = src public
XPCSHELL_TESTS = tests
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -52,17 +52,16 @@ DIRS += \
urlformatter \
contentprefs \
microformats \
places \
$(NULL)
# These component dirs are built only for XUL apps
-ifdef MOZ_XUL_APP
DIRS += \
apppicker \
filepicker \
console \
exthelper \
viewconfig \
typeaheadfind \
parentalcontrols \
@@ -128,16 +127,14 @@ endif
DIRS += \
commandlines \
startup \
build \
$(NULL)
EXTRA_PP_COMPONENTS = nsDefaultCLH.js
-endif # MOZ_XUL_APP
-
ifeq ($(MOZ_BUILD_APP),camino)
DIRS += autocomplete/public
DIRS += downloads/public
endif
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/remote/nsGTKRemoteService.cpp
+++ b/toolkit/components/remote/nsGTKRemoteService.cpp
@@ -65,22 +65,18 @@
#include "prprf.h"
#include "prenv.h"
#include "nsCRT.h"
#ifdef MOZ_WIDGET_GTK2
#include "nsGTKToolkit.h"
#endif
-#ifdef MOZ_XUL_APP
#include "nsICommandLineRunner.h"
#include "nsXULAppAPI.h"
-#else
-#include "nsISuiteRemoteService.h"
-#endif
#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION"
#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
#define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND"
#define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE"
#define MOZILLA_USER_PROP "_MOZILLA_USER"
#define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
#define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
@@ -89,21 +85,17 @@
#ifdef IS_BIG_ENDIAN
#define TO_LITTLE_ENDIAN32(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#else
#define TO_LITTLE_ENDIAN32(x) (x)
#endif
-#ifdef MOZ_XUL_APP
const unsigned char kRemoteVersion[] = "5.1";
-#else
-const unsigned char kRemoteVersion[] = "5.0";
-#endif
NS_IMPL_ISUPPORTS2(nsGTKRemoteService,
nsIRemoteService,
nsIObserver)
NS_IMETHODIMP
nsGTKRemoteService::Startup(const char* aAppName, const char* aProfileName)
{
@@ -269,42 +261,16 @@ nsGTKRemoteService::EnsureAtoms(void)
sMozCommandAtom = XAtoms[i++];
sMozResponseAtom = XAtoms[i++];
sMozUserAtom = XAtoms[i++];
sMozProfileAtom = XAtoms[i++];
sMozProgramAtom = XAtoms[i++];
sMozCommandLineAtom = XAtoms[i++];
}
-#ifndef MOZ_XUL_APP
-const char*
-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, PRUint32 aTimestamp)
-{
- nsresult rv;
-
- nsCOMPtr<nsISuiteRemoteService> remote
- (do_GetService("@mozilla.org/browser/xremoteservice;2"));
- if (!remote)
- return "509 internal error";
-
- rv = remote->ParseCommand(aCommand, aWindow);
- if (NS_SUCCEEDED(rv))
- return "200 executed command";
-
- if (NS_ERROR_INVALID_ARG == rv)
- return "500 command not parseable";
-
- if (NS_ERROR_NOT_IMPLEMENTED == rv)
- return "501 unrecognized command";
-
- return "509 internal error";
-}
-
-#else //MOZ_XUL_APP
-
// Set desktop startup ID to the passed ID, if there is one, so that any created
// windows get created with the right window manager metadata, and any windows
// that get new tabs and are activated also get the right WM metadata.
// If there is no desktop startup ID, then use the X event's timestamp
// for _NET_ACTIVE_WINDOW when the window gets focused or shown.
static void
SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
PRUint32 aTimestamp) {
@@ -478,17 +444,16 @@ nsGTKRemoteService::HandleCommandLine(ch
if (NS_ERROR_ABORT == rv)
return "500 command not parseable";
if (NS_FAILED(rv))
return "509 internal error";
return "200 executed command";
}
-#endif // MOZ_XUL_APP
void
nsGTKRemoteService::HandleCommandsFor(GtkWidget* widget,
nsIWeakReference* aWindow)
{
#ifdef MOZ_WIDGET_GTK2
g_signal_connect(G_OBJECT(widget), "property_notify_event",
G_CALLBACK(HandlePropertyChange), aWindow);
@@ -579,17 +544,16 @@ nsGTKRemoteService::HandlePropertyChange
// put the property onto the window as the response
XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
sMozResponseAtom, XA_STRING,
8, PropModeReplace, (const unsigned char *)response, strlen (response));
XFree(data);
return TRUE;
}
-#ifdef MOZ_XUL_APP
if (pevent->state == GDK_PROPERTY_NEW_VALUE &&
CMP_GATOM_XATOM(pevent->atom, sMozCommandLineAtom)) {
// We got a new commandline atom.
int result;
Atom actual_type;
int actual_format;
unsigned long nitems, bytes_after;
@@ -623,17 +587,16 @@ nsGTKRemoteService::HandlePropertyChange
// put the property onto the window as the response
XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
sMozResponseAtom, XA_STRING,
8, PropModeReplace, (const unsigned char *)response, strlen (response));
XFree(data);
return TRUE;
}
-#endif //MOZ_XUL_APP
if (pevent->state == GDK_PROPERTY_NEW_VALUE &&
CMP_GATOM_XATOM(pevent->atom, sMozResponseAtom)) {
// client accepted the response. party on wayne.
return TRUE;
}
if (pevent->state == GDK_PROPERTY_NEW_VALUE &&
--- a/toolkit/components/remote/nsGTKRemoteService.h
+++ b/toolkit/components/remote/nsGTKRemoteService.h
@@ -78,20 +78,18 @@ private:
static void EnsureAtoms();
static PLDHashOperator StartupHandler(const void* aKey,
nsIWeakReference* aData,
void* aClosure);
static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
PRUint32 aTimestamp);
-#ifdef MOZ_XUL_APP
static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
PRUint32 aTimestamp);
-#endif
static gboolean HandlePropertyChange(GtkWidget *widget,
GdkEventProperty *event,
nsIWeakReference* aThis);
GtkWidget* mServerWindow;
nsCString mAppName;
nsCString mProfileName;
--- a/toolkit/components/remote/nsPhRemoteService.cpp
+++ b/toolkit/components/remote/nsPhRemoteService.cpp
@@ -23,22 +23,18 @@
#include <stdlib.h>
#include <nsIWidget.h>
#include <nsCOMPtr.h>
#include "nsIGenericFactory.h"
#include "nsPhRemoteService.h"
#include "nsIServiceManager.h"
#include "nsCRT.h"
-#ifdef MOZ_XUL_APP
#include "nsICommandLineRunner.h"
#include "nsXULAppAPI.h"
-#else
-#include "nsISuiteRemoteService.h"
-#endif
#include <Pt.h>
NS_IMPL_QUERY_INTERFACE2(nsPhRemoteService,
nsIRemoteService,
nsIObserver)
NS_IMETHODIMP_(nsrefcnt)
--- a/toolkit/components/remote/nsQtRemoteService.cpp
+++ b/toolkit/components/remote/nsQtRemoteService.cpp
@@ -61,22 +61,18 @@
#include "prprf.h"
#include "prenv.h"
#include "nsCRT.h"
#ifdef MOZ_WIDGET_GTK2
//#include "nsGTKToolkit.h"
#endif
-#ifdef MOZ_XUL_APP
#include "nsICommandLineRunner.h"
#include "nsXULAppAPI.h"
-#else
-#include "nsISuiteRemoteService.h"
-#endif
#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION"
#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
#define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND"
#define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE"
#define MOZILLA_USER_PROP "_MOZILLA_USER"
#define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
#define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
@@ -85,21 +81,17 @@
#ifdef IS_BIG_ENDIAN
#define TO_LITTLE_ENDIAN32(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#else
#define TO_LITTLE_ENDIAN32(x) (x)
#endif
-#ifdef MOZ_XUL_APP
const unsigned char kRemoteVersion[] = "5.1";
-#else
-const unsigned char kRemoteVersion[] = "5.0";
-#endif
NS_IMPL_ISUPPORTS2(nsQtRemoteService,
nsIRemoteService,
nsIObserver)
NS_IMETHODIMP
nsQtRemoteService::Startup(const char* aAppName, const char* aProfileName)
{
--- a/toolkit/mozapps/update/src/nsUpdateService.js.in
+++ b/toolkit/mozapps/update/src/nsUpdateService.js.in
@@ -2801,17 +2801,16 @@ TimerManager.prototype = {
!iid.equals(Components.interfaces.nsITimerCallback) &&
!iid.equals(Components.interfaces.nsIObserver) &&
!iid.equals(Components.interfaces.nsISupports))
throw Components.results.NS_ERROR_NO_INTERFACE;
return this;
}
};
-#ifdef MOZ_XUL_APP
/**
* UpdatePrompt
* An object which can prompt the user with information about updates, request
* action, etc. Embedding clients can override this component with one that
* invokes a native front end.
* @constructor
*/
function UpdatePrompt() {
@@ -3079,17 +3078,16 @@ UpdatePrompt.prototype = {
*/
QueryInterface: function(iid) {
if (!iid.equals(Components.interfaces.nsIUpdatePrompt) &&
!iid.equals(Components.interfaces.nsISupports))
throw Components.results.NS_ERROR_NO_INTERFACE;
return this;
}
};
-#endif
var gModule = {
registerSelf: function(componentManager, fileSpec, location, type) {
componentManager = componentManager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
for (var key in this._objects) {
var obj = this._objects[key];
componentManager.registerFactoryLocation(obj.CID, obj.className, obj.contractID,
@@ -3122,23 +3120,21 @@ var gModule = {
className : "Update Service",
factory : makeFactory(UpdateService)
},
checker: { CID : Components.ID("{898CDC9B-E43F-422F-9CC4-2F6291B415A3}"),
contractID : "@mozilla.org/updates/update-checker;1",
className : "Update Checker",
factory : makeFactory(Checker)
},
-#ifdef MOZ_XUL_APP
prompt: { CID : Components.ID("{27ABA825-35B5-4018-9FDD-F99250A0E722}"),
contractID : "@mozilla.org/updates/update-prompt;1",
className : "Update Prompt",
factory : makeFactory(UpdatePrompt)
},
-#endif
timers: { CID : Components.ID("{B322A5C0-A419-484E-96BA-D7182163899F}"),
contractID : "@mozilla.org/updates/timer-manager;1",
className : "Timer Manager",
factory : makeFactory(TimerManager)
},
manager: { CID : Components.ID("{093C2356-4843-4C65-8709-D7DBCBBE7DFB}"),
contractID : "@mozilla.org/updates/update-manager;1",
className : "Update Manager",
@@ -3172,26 +3168,22 @@ function NSGetModule(compMgr, fileSpec)
* Determines whether or there are installed addons which are incompatible
* with this update.
* @param update
* The update to check compatibility against
* @returns true if there are no addons installed that are incompatible with
* the specified update, false otherwise.
*/
function isCompatible(update) {
-#ifdef MOZ_XUL_APP
var em =
Components.classes["@mozilla.org/extensions/manager;1"].
getService(nsIExtensionManager);
var items = em.getIncompatibleItemList("", update.extensionVersion,
update.platformVersion, nsIUpdateItem.TYPE_ANY, false, { });
return items.length == 0;
-#else
- return true;
-#endif
}
/**
* Shows a prompt for an update, provided there are no incompatible addons.
* If there are, kick off an update check and see if updates are available
* that will resolve the incompatibilities.
* @param update
* The available update to show
@@ -3200,17 +3192,16 @@ function showPromptIfNoIncompatibilities
function showPrompt(update) {
LOG("UpdateService", "_selectAndInstallUpdate: need to prompt user before continuing...");
var prompter =
Components.classes["@mozilla.org/updates/update-prompt;1"].
createInstance(Components.interfaces.nsIUpdatePrompt);
prompter.showUpdateAvailable(update);
}
-#ifdef MOZ_XUL_APP
/**
* Determines if an addon is compatible with a particular update.
* @param addon
* The addon to check
* @param version
* The extensionVersion of the update to check for compatibility
* against.
* @returns true if the addon is compatible, false otherwise
@@ -3309,11 +3300,10 @@ function showPromptIfNoIncompatibilities
update.platformVersion, nsIUpdateItem.TYPE_ANY, false, { });
var listener = new Listener(items);
// See documentation on |mode| above.
var mode = getPref("getIntPref", PREF_APP_UPDATE_INCOMPATIBLE_MODE,
nsIExtensionManager.UPDATE_CHECK_NEWVERSION);
em.update([], 0, mode, listener);
}
else
-#endif
showPrompt(update);
}
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -395,17 +395,16 @@ MAKEFILES_netwerk="
netwerk/socket/base/Makefile
netwerk/streamconv/Makefile
netwerk/streamconv/converters/Makefile
netwerk/streamconv/public/Makefile
netwerk/streamconv/src/Makefile
netwerk/streamconv/test/Makefile
netwerk/test/Makefile
netwerk/testserver/Makefile
- netwerk/resources/Makefile
netwerk/locales/Makefile
netwerk/system/Makefile
netwerk/system/win32/Makefile
"
MAKEFILES_uriloader="
uriloader/Makefile
uriloader/base/Makefile
@@ -603,17 +602,16 @@ MAKEFILES_xpfe="
MAKEFILES_embedding="
embedding/Makefile
embedding/base/Makefile
embedding/browser/Makefile
embedding/browser/activex/src/Makefile
embedding/browser/activex/src/control/Makefile
embedding/browser/activex/src/control_kicker/Makefile
embedding/browser/build/Makefile
- embedding/browser/chrome/Makefile
embedding/browser/webBrowser/Makefile
embedding/browser/gtk/Makefile
embedding/browser/gtk/src/Makefile
embedding/browser/gtk/tests/Makefile
embedding/browser/photon/Makefile
embedding/browser/photon/src/Makefile
embedding/browser/photon/tests/Makefile
embedding/components/Makefile
@@ -885,17 +883,16 @@ fi
if test -n "$MOZ_PSM"; then
add_makefiles "
security/manager/Makefile
security/manager/boot/Makefile
security/manager/boot/src/Makefile
security/manager/boot/public/Makefile
security/manager/ssl/Makefile
security/manager/ssl/src/Makefile
- security/manager/ssl/resources/Makefile
security/manager/ssl/public/Makefile
security/manager/pki/Makefile
security/manager/pki/resources/Makefile
security/manager/pki/src/Makefile
security/manager/pki/public/Makefile
security/manager/locales/Makefile
"
fi
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -184,49 +184,41 @@ endif
#
# tier "toolkit" - xpfe & toolkit
#
# The division of "gecko" and "toolkit" is somewhat arbitrary, and related
# to history where "gecko" wasn't forked between seamonkey/firefox but
# "toolkit" was.
#
-tier_toolkit_dirs += chrome
-
-tier_toolkit_dirs += profile
+tier_toolkit_dirs += chrome profile
# This must preceed xpfe
ifdef MOZ_JPROF
tier_toolkit_dirs += tools/jprof
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
tier_toolkit_dirs += xpfe/bootstrap/appleevents
endif
tier_toolkit_dirs += \
xpfe \
toolkit/components \
$(NULL)
-ifndef MOZ_XUL_APP
-tier_toolkit_dirs += themes
-endif
-
ifdef MOZ_ENABLE_XREMOTE
tier_toolkit_dirs += widget/src/xremoteclient
endif
ifdef MOZ_SPELLCHECK
tier_toolkit_dirs += extensions/spellcheck
endif
-ifdef MOZ_XUL_APP
tier_toolkit_dirs += toolkit
-endif
ifdef MOZ_XPINSTALL
tier_toolkit_dirs += xpinstall
endif
ifdef MOZ_PSM
tier_toolkit_dirs += security/manager
else
@@ -238,28 +230,24 @@ tier_toolkit_dirs += extensions/pref
endif
# JavaXPCOM JNI code is compiled into libXUL
ifdef MOZ_JAVAXPCOM
tier_toolkit_dirs += extensions/java/xpcom/src
endif
ifndef BUILD_STATIC_LIBS
-ifdef MOZ_XUL_APP
ifneq (,$(MOZ_ENABLE_GTK2))
tier_toolkit_dirs += embedding/browser/gtk
endif
endif
-endif
-ifdef MOZ_XUL_APP
ifndef BUILD_STATIC_LIBS
tier_toolkit_dirs += toolkit/library
endif
-endif
ifdef MOZ_ENABLE_LIBXUL
tier_toolkit_dirs += xpcom/stub
endif
ifdef NS_TRACE_MALLOC
tier_toolkit_dirs += tools/trace-malloc
endif
--- a/xpfe/components/download-manager/src/Makefile.in
+++ b/xpfe/components/download-manager/src/Makefile.in
@@ -58,22 +58,20 @@ REQUIRES = xpcom \
windowwatcher \
webbrowserpersist \
appshell \
dom \
profile \
widget \
pref \
embed_base \
+ alerts \
+ toolkitcomps \
$(NULL)
-ifdef MOZ_XUL_APP
-REQUIRES += alerts toolkitcomps
-endif
-
CPPSRCS = \
nsDownloadManager.cpp \
$(NULL)
# Toolkit exports this from its download manager, so we need to as we're not
# currently building the toolkit version, but other things need it.
EXTRA_JS_MODULES = \
../../../../toolkit/mozapps/downloads/src/DownloadUtils.jsm \
--- a/xpfe/components/winhooks/Makefile.in
+++ b/xpfe/components/winhooks/Makefile.in
@@ -67,19 +67,17 @@ REQUIRES = \
thebes \
locale \
xulapp \
embed_base \
$(NULL)
FORCE_STATIC_LIB = 1
-ifdef MOZ_XUL_APP
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-endif
include $(topsrcdir)/config/rules.mk
JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js
JS_SET_MAIL_COMPONENT = nsSetDefaultMail.js
JS_UNSET_MAIL_COMPONENT = nsUnsetDefaultMail.js
libs::
