Bug 275605 - libxul step 3 (all of tier 9, except libmozjs.so which will remain separate indefinitely) r=darin

2004-12-15 04:07:01 +00:00 · 2004-12-15 04:07:01 +00:00 · 81a0de68d5
--- a/Makefile.in
+++ b/Makefile.in
@ -189,24 +189,15 @@ tier_9_dirs	+= \
 		dom \
 		view \
 		widget \
-		$(NULL)
-
-ifdef MOZ_ENABLE_LIBXUL
-tier_9_dirs += \
-		toolkit/library \
-		xpcom/stub \
-		$(NULL)
-endif
-
-tier_9_dirs += \
 		content \
 		layout \
-		db \
 		xpfe/components/shistory \
 		docshell \
 		webshell \
 		embedding \
 		editor \
+		xpfe/appshell \
+		xpfe/components/xremote/public \
 		$(NULL)

 ifdef MOZ_OJI
@ -216,23 +207,15 @@ tier_9_dirs	+= \
 		$(NULL)
 endif

-tier_9_dirs	+= \
-		xpfe/appshell \
-		xpfe/components/xremote/public \
-		$(NULL)
-
 ifdef ACCESSIBILITY
 tier_9_dirs    += accessible
 endif

-ifdef MOZ_LDAP_XPCOM
-tier_9_dirs	+= directory/xpcom
-endif
-
-ifdef MOZ_XUL_APP
-ifdef MOZ_ENABLE_GTK2
-tier_9_dirs    += toolkit/components/gnome
-endif
+ifdef MOZ_ENABLE_LIBXUL
+tier_9_dirs += \
+		toolkit/library \
+		xpcom/stub \
+		$(NULL)
 endif

 # 
@ -264,7 +247,11 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 tier_50_dirs	+= xpfe/bootstrap/appleevents
 endif

-tier_50_dirs	+= xpfe themes
+tier_50_dirs	+= \
+	db \
+	xpfe \
+	themes \
+	$(NULL)

 ifdef MOZ_LEAKY
 tier_50_dirs        += tools/leaky
@ -297,6 +284,16 @@ ifdef MOZ_STORAGE
 tier_50_dirs += db/sqlite3/src storage
 endif

+ifdef MOZ_LDAP_XPCOM
+tier_50_dirs	+= directory/xpcom
+endif
+
+ifdef MOZ_XUL_APP
+ifdef MOZ_ENABLE_GTK2
+tier_50_dirs    += toolkit/components/gnome
+endif
+endif
+
 #
 # tier 9x - application features
 #
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@ -52,6 +52,7 @@ endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = accessibility.pkg

--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_toolkit_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= content \
 		  docshell \
 		  dom \
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_base_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= commandhandler \
 		  composer \
 		  content \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_html_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= content \
 		  dom \
 		  gfx \
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_toolkit_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= content \
 		  dom \
 		  editor \
--- a/accessible/src/msaa/Makefile.in
+++ b/accessible/src/msaa/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_toolkit_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= content \
 		  docshell \
 		  dom \
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_toolkit_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= content \
 		  docshell \
 		  dom \
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_xul_s
+LIBXUL_LIBRARY = 1
+
 REQUIRES	= content \
 		  dom \
 		  gfx \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= content
 LIBRARY_NAME	= gkconbase_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= content
 LIBRARY_NAME	= gkconhtmlcon_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= content
 LIBRARY_NAME	= gkconhtmldoc_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= content
 LIBRARY_NAME	= gkconxbl_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  js \
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= content
 LIBRARY_NAME	= gkconxmlcon_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  js \
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= content
 LIBRARY_NAME	= gkconxmldoc_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  js \
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xul
 LIBRARY_NAME	= gkconxulcon_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xuldoc
 LIBRARY_NAME	= gkconxuldoc_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  exthandler \
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xultmpl
 LIBRARY_NAME	= gkconxultmpl_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  js \
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -49,6 +49,7 @@ XPIDL_MODULE	= docshell_base
 endif
 LIBRARY_NAME	= basedocshell_s
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@ -50,6 +50,7 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= docshell
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = docshell.pkg

--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
 LIBRARY_NAME	= jsdombase_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  webbrwsr \
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
 LIBRARY_NAME	= jsdomevents_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  js \
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@ -47,6 +47,7 @@ LIBRARY_NAME	= jsurl_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= javascript__protocol
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -47,6 +47,7 @@ LIBRARY_NAME	= composer
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsComposerModule
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = composer.pkg

--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= editor
 LIBRARY_NAME	= editorbase_s
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/editor/libeditor/build/Makefile.in
+++ b/editor/libeditor/build/Makefile.in
@ -50,12 +50,11 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = editor.pkg

-ifndef MOZ_ENABLE_LIBXUL
 EXTRA_DSO_LIBS	= gkgfx
-endif

 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR)		 \
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= editor
 LIBRARY_NAME	= htmleditor_s
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= editor
 LIBRARY_NAME	= texteditor_s
-IS_COMPONENT	= 1
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/editor/txmgr/Makefile.in
+++ b/editor/txmgr/Makefile.in
@ -46,7 +46,7 @@ MODULE		= txmgr
 DIRS		= public src idl

 ifdef ENABLE_TESTS
-DIRS		+= tests
+TOOL_DIRS	+= tests
 endif

 include $(topsrcdir)/config/rules.mk
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@ -47,6 +47,7 @@ LIBRARY_NAME	= txmgr
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTransactionManagerModule
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = txmgr.pkg

--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -46,6 +46,8 @@ MODULE		= txtsvc
 LIBRARY_NAME	= txtsvc_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsTextServicesModule
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  editor \
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@ -46,6 +46,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE       = embed
 PACKAGE_FILE = embed.pkg

-DIRS = base components browser lite
+DIRS = base components browser
+
+ifndef MOZ_XUL_APP
+DIRS += lite
+endif

 include $(topsrcdir)/config/rules.mk
--- a/embedding/browser/Makefile.in
+++ b/embedding/browser/Makefile.in
@ -47,7 +47,7 @@ DIRS=webBrowser build chrome

 ifeq ($(OS_ARCH),WINNT)
 ifndef MOZ_NO_ACTIVEX_SUPPORT
-DIRS += activex/src
+TOOL_DIRS += activex/src
 endif
 endif

--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@ -41,16 +41,15 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

-MODULE		= webbrwsr
-
-IS_COMPONENT	= 1
-MODULE_NAME	= Browser_Embedding_Module
-
 include $(DEPTH)/config/autoconf.mk

+MODULE		= webbrwsr
 LIBRARY_NAME	= webbrwsr
-EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= Browser_Embedding_Module
+EXPORT_LIBRARY	= 1
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = webbrowser.pkg

--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@ -47,6 +47,7 @@ MODULE		= webbrwsr
 XPIDL_MODULE	= webBrowser_core
 LIBRARY_NAME	= nsWebBrowser_s
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= appstartupnotifier_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  $(NULL)
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@ -50,6 +50,7 @@ endif
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS	= mozutil_s
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@ -57,6 +57,7 @@ REQUIRES	= string \
 		  $(NULL)

 LIBRARY_NAME	= commandhandler_s
+LIBXUL_LIBRARY	= 1

 CPPSRCS		= \
      nsBaseCommandController.cpp \
--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= find
 LIBRARY_NAME	= find_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= string \
 		  xpcom \
 		  dom \
--- a/embedding/components/jsconsole/src/Makefile.in
+++ b/embedding/components/jsconsole/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= jsconsole_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= jsconsole \
 		  xpcom \
 		  string \
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= printingui_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= printingui_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= printingui_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= printingui_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= webbrowserpersist
 LIBRARY_NAME	= webbrowserpersist_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= embedcomponents
 LIBRARY_NAME	= windowwatcher_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/js/src/liveconnect/Makefile.in
+++ b/js/src/liveconnect/Makefile.in
@ -46,12 +46,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= liveconnect
 LIBRARY_NAME	= jsj
 EXPORT_LIBRARY = 1
-ifeq ($(OS_ARCH),WINNT)
+ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 LIBRARY_NAME	= jsj$(MOZ_BITS)$(VERSION_NUMBER)
 MAPFILE		= $(LIBRARY_NAME).map
 endif
 JNI_GEN_DIR	= _jni
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = liveconnect.pkg

--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@ -69,7 +69,9 @@ endif
 DIRS           += build

 ifdef ENABLE_TESTS
-DIRS		+= html/tests
+ifndef MOZ_ENABLE_LIBXUL
+TOOL_DIRS	+= html/tests
+endif
 endif

 include $(topsrcdir)/config/rules.mk
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -46,6 +46,8 @@ MODULE		= layout
 XPIDL_MODULE	= layout_base
 GRE_MODULE	= 1
 LIBRARY_NAME	= gkbase_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -56,6 +56,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = layout.pkg
 PACKAGE_VARS += MOZ_XUL
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
 LIBRARY_NAME	= gkforms_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  locale \
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -43,6 +43,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
 LIBRARY_NAME	= gkgeneric_s
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = layout
 LIBRARY_NAME = gkmathmlbase_s
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = mathml.pkg

--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@ -47,6 +47,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE	= layout
 LIBRARY_NAME = gkmathmlcon_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@ -45,6 +45,7 @@ MODULE		= layout
 XPIDL_MODULE	= layout_printing
 GRE_MODULE	= 1
 LIBRARY_NAME	= gkprinting_s
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@ -45,6 +45,7 @@ DIRS = xbl-marquee

 MODULE		= layout
 LIBRARY_NAME	= gkstyle_s
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@ -46,6 +46,8 @@ DIRS = resources

 MODULE		= layout
 LIBRARY_NAME	= gksvgbase_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  content \
--- a/layout/svg/renderer/src/cairo/Makefile.in
+++ b/layout/svg/renderer/src/cairo/Makefile.in
@ -47,6 +47,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = layout
 LIBRARY_NAME = gksvgrenderercairo_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES = \
 	xpcom   \
 	widget  \
--- a/layout/svg/renderer/src/gdiplus/Makefile.in
+++ b/layout/svg/renderer/src/gdiplus/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = layout
 LIBRARY_NAME = gksvgrenderergdiplus_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES = 	xpcom \
 			widget \
 			gfx \
--- a/layout/svg/renderer/src/libart/Makefile.in
+++ b/layout/svg/renderer/src/libart/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = layout
 LIBRARY_NAME = gksvgrendererlibart_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES = \
 	xpcom   \
 	widget  \
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
 LIBRARY_NAME	= gktable_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/layout/xtf/src/Makefile.in
+++ b/layout/xtf/src/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
 LIBRARY_NAME	= gkxtfbase_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  content \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
 LIBRARY_NAME	= gkxulbase_s
+LIBXUL_LIBRARY	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/modules/oji/src/Makefile.in
+++ b/modules/oji/src/Makefile.in
@ -46,6 +46,7 @@ MODULE		= oji
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCJVMManagerModule
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = oji.pkg

--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@ -105,6 +105,14 @@ COMPONENT_LIBS += \
 	htmlpars \
 	imglib2 \
 	gkplugin \
+	gklayout \
+	docshell \
+	embedcomponents \
+	webbrwsr \
+	editor \
+	nsappshell \
+	txmgr \
+	composer \
 	$(NULL)

 ifeq ($(OS_ARCH),WINNT)
@ -204,6 +212,15 @@ ifdef MOZ_ENABLE_XREMOTE
 COMPONENT_LIBS += xremote_client
 endif

+ifdef MOZ_OJI
+STATIC_LIBS += jsj
+COMPONENT_LIBS += oji
+endif
+
+ifdef ACCESSIBILITY
+COMPONENT_LIBS += accessibility
+endif
+
 SHARED_LIBRARY_LIBS = \
 	$(foreach lib,$(STATIC_LIBS),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
 	$(foreach component,$(COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
@ -278,6 +295,18 @@ DSO_LDOPTS += -Wl,--export-all-symbols
 endif
 endif # WINNT

+ifdef MOZ_SVG_RENDERER_GDIPLUS
+OS_LIBS += Gdiplus.lib
+endif
+
+ifdef MOZ_SVG_RENDERER_LIBART
+EXTRA_DSO_LDOPTS += $(MOZ_LIBART_LIBS)
+endif
+
+ifneq (,$(MOZ_ENABLE_CAIRO)$(MOZ_SVG_RENDERER_CAIRO))
+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
+endif
+
 export:: dlldeps.cpp dlldeps-obs.cpp

 dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@ -134,6 +134,18 @@
 #define XREMOTE_MODULES
 #endif

+#ifdef OJI
+#define OJI_MODULES MODULE(nsCJVMManagerModule)
+#else
+#define OJI_MODULES
+#endif
+
+#ifdef ACCESSIBILITY
+#define ACCESS_MODULES MODULE(nsAccessibilityModule)
+#else
+#define ACCESS_MODULES
+#endif
+
 #define XUL_MODULES                          \
    MODULE(xpcomObsoleteModule)              \
    MODULE(xpconnect)                        \
@ -156,6 +168,16 @@
    MODULE(nsImageLib2Module)                \
    ICON_MODULE                              \
    MODULE(nsPluginModule)                   \
+    MODULE(nsLayoutModule)                   \
+    MODULE(docshell_provider)                \
+    MODULE(embedcomponents)                  \
+    MODULE(Browser_Embedding_Module)         \
+    MODULE(nsEditorModule)                   \
+    OJI_MODULES                              \
+    ACCESS_MODULES                           \
+    MODULE(appshell)                         \
+    MODULE(nsTransactionManagerModule)       \
+    MODULE(nsComposerModule)                 \
    /* end of list */

 #define MODULE(_name)                                           \
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@ -47,6 +47,7 @@ LIBRARY_NAME	= gkview_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsViewModule
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -49,6 +49,7 @@ LIBRARY_NAME	= nsappshell
 EXPORT_LIBRARY  = 1
 SHORT_LIBNAME	= appshell
 GRE_MODULE	= 1
+LIBXUL_LIBRARY	= 1

 PACKAGE_FILE = appshell.pkg

--- a/xpfe/components/shistory/src/Makefile.in
+++ b/xpfe/components/shistory/src/Makefile.in
@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= shistory
 LIBRARY_NAME	= shistory_s
 FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY	= 1

 REQUIRES	= xpcom \
 		  string \