From 3edf9d37c852ab36c5aece0496a353bf05d5587f Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Wed, 15 Dec 2004 04:07:01 +0000 Subject: [PATCH] Bug 275605 - libxul step 3 (all of tier 9, except libmozjs.so which will remain separate indefinitely) r=darin git-svn-id: svn://10.0.0.236/trunk@166737 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 47 +++++++++---------- mozilla/accessible/build/Makefile.in | 1 + mozilla/accessible/src/atk/Makefile.in | 2 + mozilla/accessible/src/base/Makefile.in | 2 + mozilla/accessible/src/html/Makefile.in | 2 + mozilla/accessible/src/mac/Makefile.in | 2 + mozilla/accessible/src/msaa/Makefile.in | 2 + mozilla/accessible/src/other/Makefile.in | 2 + mozilla/accessible/src/xul/Makefile.in | 2 + mozilla/content/base/src/Makefile.in | 2 + mozilla/content/html/content/src/Makefile.in | 2 + mozilla/content/html/document/src/Makefile.in | 2 + mozilla/content/xbl/src/Makefile.in | 2 + mozilla/content/xml/content/src/Makefile.in | 2 + mozilla/content/xml/document/src/Makefile.in | 2 + mozilla/content/xul/content/src/Makefile.in | 2 + mozilla/content/xul/document/src/Makefile.in | 2 + mozilla/content/xul/templates/src/Makefile.in | 2 + mozilla/docshell/base/Makefile.in | 1 + mozilla/docshell/build/Makefile.in | 1 + mozilla/dom/src/base/Makefile.in | 2 + mozilla/dom/src/events/Makefile.in | 2 + mozilla/dom/src/jsurl/Makefile.in | 1 + mozilla/editor/composer/src/Makefile.in | 1 + mozilla/editor/libeditor/base/Makefile.in | 1 + mozilla/editor/libeditor/build/Makefile.in | 3 +- mozilla/editor/libeditor/html/Makefile.in | 1 + mozilla/editor/libeditor/text/Makefile.in | 2 +- mozilla/editor/txmgr/Makefile.in | 2 +- mozilla/editor/txmgr/src/Makefile.in | 1 + mozilla/editor/txtsvc/src/Makefile.in | 2 + mozilla/embedding/Makefile.in | 6 ++- mozilla/embedding/browser/Makefile.in | 2 +- mozilla/embedding/browser/build/Makefile.in | 11 ++--- .../embedding/browser/webBrowser/Makefile.in | 1 + .../components/appstartup/src/Makefile.in | 2 + .../embedding/components/build/Makefile.in | 1 + .../components/commandhandler/src/Makefile.in | 1 + .../embedding/components/find/src/Makefile.in | 2 + .../components/jsconsole/src/Makefile.in | 2 + .../components/printingui/src/mac/Makefile.in | 2 + .../components/printingui/src/os2/Makefile.in | 2 + .../printingui/src/unixshared/Makefile.in | 2 + .../components/printingui/src/win/Makefile.in | 2 + .../webbrowserpersist/src/Makefile.in | 2 + .../components/windowwatcher/src/Makefile.in | 2 + mozilla/js/src/liveconnect/Makefile.in | 3 +- mozilla/layout/Makefile.in | 4 +- mozilla/layout/base/Makefile.in | 2 + mozilla/layout/build/Makefile.in | 1 + mozilla/layout/forms/Makefile.in | 2 + mozilla/layout/generic/Makefile.in | 1 + mozilla/layout/mathml/base/src/Makefile.in | 1 + mozilla/layout/mathml/content/src/Makefile.in | 2 + mozilla/layout/printing/Makefile.in | 1 + mozilla/layout/style/Makefile.in | 1 + mozilla/layout/svg/base/src/Makefile.in | 2 + .../layout/svg/renderer/src/cairo/Makefile.in | 2 + .../svg/renderer/src/gdiplus/Makefile.in | 2 + .../svg/renderer/src/libart/Makefile.in | 2 + mozilla/layout/tables/Makefile.in | 2 + mozilla/layout/xtf/src/Makefile.in | 2 + mozilla/layout/xul/base/src/Makefile.in | 2 + mozilla/modules/oji/src/Makefile.in | 1 + mozilla/toolkit/library/Makefile.in | 29 ++++++++++++ .../toolkit/library/nsStaticXULComponents.cpp | 22 +++++++++ mozilla/view/src/Makefile.in | 1 + mozilla/xpfe/appshell/src/Makefile.in | 1 + .../xpfe/components/shistory/src/Makefile.in | 1 + 69 files changed, 188 insertions(+), 39 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 5c306fc6eb2..f93c020130d 100644 --- a/mozilla/Makefile.in +++ b/mozilla/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 # diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in index b3ae2c5dc84..be2c52ce789 100644 --- a/mozilla/accessible/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/accessible/src/atk/Makefile.in b/mozilla/accessible/src/atk/Makefile.in index 83575d2ff22..7a0750e2dc6 100644 --- a/mozilla/accessible/src/atk/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/accessible/src/base/Makefile.in b/mozilla/accessible/src/base/Makefile.in index 7ce4504533f..a07d2938161 100644 --- a/mozilla/accessible/src/base/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/accessible/src/html/Makefile.in b/mozilla/accessible/src/html/Makefile.in index 5fc3ca56062..4b9e1b12162 100644 --- a/mozilla/accessible/src/html/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/accessible/src/mac/Makefile.in b/mozilla/accessible/src/mac/Makefile.in index 598ebd75801..d0bad81d4dc 100644 --- a/mozilla/accessible/src/mac/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/accessible/src/msaa/Makefile.in b/mozilla/accessible/src/msaa/Makefile.in index 469c08f553b..9187b2c7de1 100644 --- a/mozilla/accessible/src/msaa/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/accessible/src/other/Makefile.in b/mozilla/accessible/src/other/Makefile.in index 698f15d87e8..37a377f1dff 100755 --- a/mozilla/accessible/src/other/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/accessible/src/xul/Makefile.in b/mozilla/accessible/src/xul/Makefile.in index 7cca98cae2f..a214b723f87 100644 --- a/mozilla/accessible/src/xul/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in index a9290d319e8..55695440175 100644 --- a/mozilla/content/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index dbeb673e8d0..4804741fd28 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in index 566112a687f..e60af44ea17 100644 --- a/mozilla/content/html/document/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index bf26e31bc16..0464241426d 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 2424be43a11..e7dd530b368 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index 5b261b87103..2886c77fd4b 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in index b4bf6325dc3..8a48d0a9967 100644 --- a/mozilla/content/xul/content/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in index 9b8383ab48d..0ba7e476ae1 100644 --- a/mozilla/content/xul/document/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xul/templates/src/Makefile.in b/mozilla/content/xul/templates/src/Makefile.in index 4cd74c486d2..a5b547a7bd6 100644 --- a/mozilla/content/xul/templates/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index 1044536f09d..a392a676e36 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in index 4b89cb5187a..6e55350cb57 100644 --- a/mozilla/docshell/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 670f2a365ea..905afaca1e1 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/dom/src/events/Makefile.in b/mozilla/dom/src/events/Makefile.in index b44f136e8e6..24dc15c53e1 100644 --- a/mozilla/dom/src/events/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/dom/src/jsurl/Makefile.in b/mozilla/dom/src/jsurl/Makefile.in index a779440b496..3401e37dd84 100644 --- a/mozilla/dom/src/jsurl/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/editor/composer/src/Makefile.in b/mozilla/editor/composer/src/Makefile.in index 2e8ac98c70e..95e3d4358b8 100644 --- a/mozilla/editor/composer/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/editor/libeditor/base/Makefile.in b/mozilla/editor/libeditor/base/Makefile.in index 2459a916bd9..7543da99997 100644 --- a/mozilla/editor/libeditor/base/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in index 3535039c60f..1a6155f1f46 100644 --- a/mozilla/editor/libeditor/build/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/editor/libeditor/html/Makefile.in b/mozilla/editor/libeditor/html/Makefile.in index f7f5e86024a..2813cbe94a4 100644 --- a/mozilla/editor/libeditor/html/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/editor/libeditor/text/Makefile.in b/mozilla/editor/libeditor/text/Makefile.in index f1d9d7aad09..dd1dda2015c 100644 --- a/mozilla/editor/libeditor/text/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/editor/txmgr/Makefile.in b/mozilla/editor/txmgr/Makefile.in index 831d8914ff8..b893e578dd9 100644 --- a/mozilla/editor/txmgr/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/editor/txmgr/src/Makefile.in b/mozilla/editor/txmgr/src/Makefile.in index d45bbdd951f..9da09991fd2 100644 --- a/mozilla/editor/txmgr/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in index a873b9e991b..8bfbfa4f24d 100644 --- a/mozilla/editor/txtsvc/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/Makefile.in b/mozilla/embedding/Makefile.in index 3688b4c843e..63012641037 100644 --- a/mozilla/embedding/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/embedding/browser/Makefile.in b/mozilla/embedding/browser/Makefile.in index 35e4579c68e..5de9c35008c 100644 --- a/mozilla/embedding/browser/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in index 0e7eb235a1d..ea422272853 100644 --- a/mozilla/embedding/browser/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in index 36a939cdac9..165b22b1fed 100644 --- a/mozilla/embedding/browser/webBrowser/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/appstartup/src/Makefile.in b/mozilla/embedding/components/appstartup/src/Makefile.in index 0d9247dbda0..1407cc1c960 100644 --- a/mozilla/embedding/components/appstartup/src/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in index d1184cc0e16..97ff38cc81e 100644 --- a/mozilla/embedding/components/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/embedding/components/commandhandler/src/Makefile.in b/mozilla/embedding/components/commandhandler/src/Makefile.in index 1ffdaeb06c3..3fcf074e423 100644 --- a/mozilla/embedding/components/commandhandler/src/Makefile.in +++ b/mozilla/embedding/components/commandhandler/src/Makefile.in @@ -57,6 +57,7 @@ REQUIRES = string \ $(NULL) LIBRARY_NAME = commandhandler_s +LIBXUL_LIBRARY = 1 CPPSRCS = \ nsBaseCommandController.cpp \ diff --git a/mozilla/embedding/components/find/src/Makefile.in b/mozilla/embedding/components/find/src/Makefile.in index e63c98e8f4c..f963b265b54 100644 --- a/mozilla/embedding/components/find/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/jsconsole/src/Makefile.in b/mozilla/embedding/components/jsconsole/src/Makefile.in index f5e867fe3db..35b25211b7e 100644 --- a/mozilla/embedding/components/jsconsole/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/printingui/src/mac/Makefile.in b/mozilla/embedding/components/printingui/src/mac/Makefile.in index 04e0a109d1b..a9d8363fa36 100644 --- a/mozilla/embedding/components/printingui/src/mac/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/printingui/src/os2/Makefile.in b/mozilla/embedding/components/printingui/src/os2/Makefile.in index 3ca5b2acfcd..f9ca79341fd 100644 --- a/mozilla/embedding/components/printingui/src/os2/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/printingui/src/unixshared/Makefile.in b/mozilla/embedding/components/printingui/src/unixshared/Makefile.in index 3ca5b2acfcd..f9ca79341fd 100644 --- a/mozilla/embedding/components/printingui/src/unixshared/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/printingui/src/win/Makefile.in b/mozilla/embedding/components/printingui/src/win/Makefile.in index efafed0fae1..8d7024412fb 100644 --- a/mozilla/embedding/components/printingui/src/win/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/webbrowserpersist/src/Makefile.in b/mozilla/embedding/components/webbrowserpersist/src/Makefile.in index e1a3858229a..ae2f10ff9f1 100644 --- a/mozilla/embedding/components/webbrowserpersist/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/embedding/components/windowwatcher/src/Makefile.in b/mozilla/embedding/components/windowwatcher/src/Makefile.in index 62b382a2c47..f71ef648bbf 100644 --- a/mozilla/embedding/components/windowwatcher/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/js/src/liveconnect/Makefile.in b/mozilla/js/src/liveconnect/Makefile.in index d3a9ef836a5..3b0a49811cc 100644 --- a/mozilla/js/src/liveconnect/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/Makefile.in b/mozilla/layout/Makefile.in index cf4a113bdf8..bb7b2b0fc64 100644 --- a/mozilla/layout/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/base/Makefile.in b/mozilla/layout/base/Makefile.in index 7e7dbbdfe73..9190eb8c0ea 100644 --- a/mozilla/layout/base/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 9f508751593..0bcc617fcdc 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/forms/Makefile.in b/mozilla/layout/forms/Makefile.in index 4366af6ef30..ef0a593ef04 100644 --- a/mozilla/layout/forms/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/generic/Makefile.in b/mozilla/layout/generic/Makefile.in index 658fb887a3d..813af0c8b95 100644 --- a/mozilla/layout/generic/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index afefe474807..687ae9c0ca6 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index 8eaee3f4f80..1cae51211a6 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/printing/Makefile.in b/mozilla/layout/printing/Makefile.in index 49ce878b576..8d53c445954 100644 --- a/mozilla/layout/printing/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/style/Makefile.in b/mozilla/layout/style/Makefile.in index d4f6689a6d6..6440574e1d1 100644 --- a/mozilla/layout/style/Makefile.in +++ b/mozilla/layout/style/Makefile.in @@ -45,6 +45,7 @@ DIRS = xbl-marquee MODULE = layout LIBRARY_NAME = gkstyle_s +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index 81a12c54441..0e7c36fddcc 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/svg/renderer/src/cairo/Makefile.in b/mozilla/layout/svg/renderer/src/cairo/Makefile.in index cc3b38eb6d3..3785b1673da 100644 --- a/mozilla/layout/svg/renderer/src/cairo/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/svg/renderer/src/gdiplus/Makefile.in b/mozilla/layout/svg/renderer/src/gdiplus/Makefile.in index 97f5bcc321c..ceea48a3afe 100644 --- a/mozilla/layout/svg/renderer/src/gdiplus/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/svg/renderer/src/libart/Makefile.in b/mozilla/layout/svg/renderer/src/libart/Makefile.in index 5fa357cee29..90034cb00f7 100644 --- a/mozilla/layout/svg/renderer/src/libart/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/tables/Makefile.in b/mozilla/layout/tables/Makefile.in index 8459562b8b6..852b2c31ad2 100644 --- a/mozilla/layout/tables/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/xtf/src/Makefile.in b/mozilla/layout/xtf/src/Makefile.in index 24074255a97..a7fea3f5493 100644 --- a/mozilla/layout/xtf/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index a139652d470..75e2e48c80d 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in index 8e5ef595ffa..e1eecbae7e7 100644 --- a/mozilla/modules/oji/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in index fceb5506033..da03ec067b7 100644 --- a/mozilla/toolkit/library/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp index f636ec303d6..d8a2f36bfc5 100644 --- a/mozilla/toolkit/library/nsStaticXULComponents.cpp +++ b/mozilla/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) \ diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in index 56e1ac444ad..ebbc1893ae9 100644 --- a/mozilla/view/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index d56ecbd2f9a..3c8900e9d6f 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/shistory/src/Makefile.in b/mozilla/xpfe/components/shistory/src/Makefile.in index ad4f6f6ef87..6db8eeb7ad8 100644 --- a/mozilla/xpfe/components/shistory/src/Makefile.in +++ b/mozilla/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 \