From 4c08900f0e75b24bc3d0bbcf42ab010b4c745464 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Thu, 9 Dec 2004 19:28:35 +0000 Subject: [PATCH] Bug 273876 - libxul step 2 (everything through widget, except spidermonkey) r=darin; again, this should not affect non-xulrunner trees. git-svn-id: svn://10.0.0.236/trunk@166497 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 85 +++++----- mozilla/allmakefiles.sh | 1 + mozilla/caps/src/Makefile.in | 1 + mozilla/config/autoconf.mk.in | 6 +- mozilla/config/config.mk | 21 +++ mozilla/configure.in | 1 - mozilla/docshell/build/Makefile.in | 2 +- mozilla/editor/libeditor/build/Makefile.in | 2 + mozilla/gfx/Makefile.in | 2 +- mozilla/gfx/src/Makefile.in | 1 + mozilla/gfx/src/beos/Makefile.in | 1 + mozilla/gfx/src/cairo/Makefile.in | 1 + mozilla/gfx/src/gtk/Makefile.in | 1 + mozilla/gfx/src/mac/Makefile.in | 3 +- mozilla/gfx/src/os2/Makefile.in | 1 + mozilla/gfx/src/photon/Makefile.in | 1 + mozilla/gfx/src/ps/Makefile.in | 1 + mozilla/gfx/src/qt/Makefile.in | 1 + mozilla/gfx/src/shared/Makefile.in | 1 + mozilla/gfx/src/windows/Makefile.in | 1 + mozilla/gfx/src/xlib/Makefile.in | 1 + mozilla/gfx/src/xlibrgb/Makefile.in | 1 + mozilla/gfx/src/xprint/Makefile.in | 1 + mozilla/gfx/src/xprintutil/Makefile.in | 1 + mozilla/intl/build/Makefile.in | 1 + mozilla/intl/chardet/Makefile.in | 2 +- mozilla/intl/chardet/src/Makefile.in | 1 + mozilla/intl/compatibility/src/Makefile.in | 1 + mozilla/intl/locale/src/Makefile.in | 2 + mozilla/intl/locale/src/mac/Makefile.in | 1 + mozilla/intl/locale/src/os2/Makefile.in | 1 + mozilla/intl/locale/src/unix/Makefile.in | 1 + mozilla/intl/locale/src/windows/Makefile.in | 1 + mozilla/intl/lwbrk/Makefile.in | 2 +- mozilla/intl/lwbrk/src/Makefile.in | 1 + mozilla/intl/strres/Makefile.in | 2 +- mozilla/intl/strres/src/Makefile.in | 1 + mozilla/intl/uconv/Makefile.in | 2 +- mozilla/intl/uconv/native/Makefile.in | 1 + mozilla/intl/uconv/src/Makefile.in | 2 +- mozilla/intl/uconv/ucvcn/Makefile.in | 3 +- mozilla/intl/uconv/ucvibm/Makefile.in | 3 +- mozilla/intl/uconv/ucvja/Makefile.in | 5 +- mozilla/intl/uconv/ucvko/Makefile.in | 3 +- mozilla/intl/uconv/ucvlatin/Makefile.in | 3 +- mozilla/intl/uconv/ucvmath/Makefile.in | 1 + mozilla/intl/uconv/ucvtw/Makefile.in | 3 +- mozilla/intl/uconv/ucvtw2/Makefile.in | 5 +- mozilla/intl/uconv/util/Makefile.in | 3 +- mozilla/intl/unicharutil/Makefile.in | 2 +- mozilla/intl/unicharutil/src/Makefile.in | 1 + mozilla/intl/unicharutil/util/Makefile.in | 15 +- mozilla/ipc/ipcd/client/src/Makefile.in | 1 + .../ipcd/extensions/dconnect/src/Makefile.in | 2 +- .../ipc/ipcd/extensions/lock/src/Makefile.in | 2 +- .../extensions/transmngr/build/Makefile.in | 1 + mozilla/js/src/xpconnect/Makefile.in | 9 +- mozilla/js/src/xpconnect/loader/Makefile.in | 2 + mozilla/js/src/xpconnect/src/Makefile.in | 3 +- mozilla/layout/build/Makefile.in | 2 + mozilla/modules/libimg/png/Makefile.in | 2 +- mozilla/modules/libjar/Makefile.in | 3 + mozilla/modules/libpr0n/build/Makefile.in | 1 + .../modules/libpr0n/decoders/bmp/Makefile.in | 1 + .../modules/libpr0n/decoders/gif/Makefile.in | 1 + .../modules/libpr0n/decoders/icon/Makefile.in | 1 + .../libpr0n/decoders/icon/gtk/Makefile.in | 1 + .../libpr0n/decoders/icon/mac/Makefile.in | 1 + .../libpr0n/decoders/icon/os2/Makefile.in | 1 + .../libpr0n/decoders/icon/win/Makefile.in | 1 + .../modules/libpr0n/decoders/jpeg/Makefile.in | 2 +- .../modules/libpr0n/decoders/png/Makefile.in | 1 + .../modules/libpr0n/decoders/xbm/Makefile.in | 1 + mozilla/modules/libpr0n/src/Makefile.in | 1 + mozilla/modules/libpref/src/Makefile.in | 3 +- mozilla/modules/plugin/base/src/Makefile.in | 1 + mozilla/netwerk/Makefile.in | 2 +- mozilla/netwerk/base/src/Makefile.in | 2 + mozilla/netwerk/build/Makefile.in | 1 + mozilla/netwerk/build2/Makefile.in | 1 + mozilla/netwerk/cache/src/Makefile.in | 2 + mozilla/netwerk/cookie/src/Makefile.in | 2 + mozilla/netwerk/dns/src/Makefile.in | 2 + mozilla/netwerk/mime/src/Makefile.in | 2 + .../netwerk/protocol/about/src/Makefile.in | 2 + mozilla/netwerk/protocol/data/src/Makefile.in | 2 + mozilla/netwerk/protocol/file/src/Makefile.in | 2 + mozilla/netwerk/protocol/ftp/src/Makefile.in | 2 + .../netwerk/protocol/gopher/src/Makefile.in | 4 +- mozilla/netwerk/protocol/http/src/Makefile.in | 2 + .../netwerk/protocol/keyword/src/Makefile.in | 2 + mozilla/netwerk/protocol/res/src/Makefile.in | 2 + .../protocol/viewsource/src/Makefile.in | 2 + mozilla/netwerk/socket/base/Makefile.in | 2 + mozilla/netwerk/streamconv/Makefile.in | 2 +- .../netwerk/streamconv/converters/Makefile.in | 2 + mozilla/netwerk/streamconv/src/Makefile.in | 2 + mozilla/parser/htmlparser/Makefile.in | 2 +- mozilla/parser/htmlparser/src/Makefile.in | 1 + mozilla/rdf/Makefile.in | 2 +- mozilla/rdf/base/src/Makefile.in | 2 + mozilla/rdf/build/Makefile.in | 1 + mozilla/rdf/datasource/src/Makefile.in | 2 + mozilla/toolkit/library/Makefile.in | 157 ++++++++++++++++-- mozilla/toolkit/library/dlldeps-zlib.cpp | 1 - mozilla/toolkit/library/nsDllMain.cpp | 80 +++++++++ mozilla/toolkit/library/nsGFXDeps.cpp | 66 ++++++++ .../toolkit/library/nsStaticXULComponents.cpp | 113 ++++++++++++- mozilla/tools/trace-malloc/lib/Makefile.in | 1 + mozilla/widget/src/beos/Makefile.in | 1 + mozilla/widget/src/build/Makefile.in | 1 + mozilla/widget/src/cocoa/Makefile.in | 1 + mozilla/widget/src/gtk/Makefile.in | 1 + mozilla/widget/src/gtk2/Makefile.in | 1 + mozilla/widget/src/gtksuperwin/Makefile.in | 1 + mozilla/widget/src/gtkxtbin/Makefile.in | 1 + mozilla/widget/src/mac/Makefile.in | 1 + mozilla/widget/src/os2/Makefile.in | 1 + mozilla/widget/src/photon/Makefile.in | 2 + mozilla/widget/src/support/Makefile.in | 1 + mozilla/widget/src/windows/Makefile.in | 1 + mozilla/widget/src/windows/nsToolkit.cpp | 2 +- mozilla/widget/src/xlib/Makefile.in | 1 + mozilla/widget/src/xlibxtbin/Makefile.in | 1 + mozilla/widget/src/xpwidgets/Makefile.in | 2 + mozilla/widget/src/xremoteclient/Makefile.in | 1 + mozilla/xpcom/Makefile.in | 11 +- mozilla/xpcom/threads/plevent.c | 4 +- 128 files changed, 649 insertions(+), 107 deletions(-) create mode 100644 mozilla/toolkit/library/nsDllMain.cpp create mode 100644 mozilla/toolkit/library/nsGFXDeps.cpp diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 0a142b282ba..e52c0578c9b 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -142,15 +142,8 @@ tier_2_dirs = \ xpcom/obsolete \ $(NULL) -ifdef MOZ_ENABLE_LIBXUL -tier_2_dirs += \ - toolkit/library \ - xpcom/stub \ - $(NULL) -endif - ifdef NS_TRACE_MALLOC -tier_2_dirs += tools/trace-malloc/lib tools/trace-malloc +tier_2_dirs += tools/trace-malloc/lib endif # @@ -162,13 +155,6 @@ tier_9_dirs += \ intl \ $(NULL) -ifdef MOZ_OJI -tier_9_dirs += \ - js/src/liveconnect \ - modules/oji \ - $(NULL) -endif - ifdef MOZ_ENABLE_XLIB tier_9_dirs += gfx/src/xlibrgb widget/src/xlibxtbin endif @@ -203,6 +189,16 @@ 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 \ @@ -213,16 +209,11 @@ tier_9_dirs += \ editor \ $(NULL) -ifdef MOZ_THUNDERBIRD -ifdef MOZ_USE_OFFICIAL_BRANDING -tier_9_dirs += other-licenses/branding/thunderbird -endif -endif - -ifdef MOZ_PHOENIX -ifdef MOZ_USE_OFFICIAL_BRANDING -tier_9_dirs += other-licenses/branding/firefox -endif +ifdef MOZ_OJI +tier_9_dirs += \ + js/src/liveconnect \ + modules/oji \ + $(NULL) endif tier_9_dirs += \ @@ -298,19 +289,8 @@ ifdef MOZ_XPINSTALL tier_50_dirs += xpinstall endif -# Many standalone tools/test can't be built until after libxul is available. -ifdef MOZ_ENABLE_LIBXUL -tier_50_dirs += xpcom/tools -ifdef ENABLE_TESTS -tier_50_dirs += \ - xpcom/tests \ - xpcom/sample \ - xpcom/typelib/xpt/tests \ - xpcom/reflect/xptinfo/tests \ - xpcom/reflect/xptcall/tests \ - xpcom/proxy/tests \ - $(NULL) -endif +ifdef NS_TRACE_MALLOC +tier_50_dirs += tools/trace-malloc endif # @@ -348,6 +328,9 @@ endif endif ifdef MOZ_PHOENIX +ifdef MOZ_USE_OFFICIAL_BRANDING +tier_99_dirs += other-licenses/branding/firefox +endif tier_99_dirs += browser xpfe/bootstrap/init.d ifdef MOZ_USE_OFFICIAL_BRANDING tier_99_dirs += other-licenses/branding/firefox/content @@ -359,6 +342,9 @@ tier_99_dirs += xulrunner endif ifdef MOZ_THUNDERBIRD +ifdef MOZ_USE_OFFICIAL_BRANDING +tier_99_dirs += other-licenses/branding/thunderbird +endif tier_99_dirs += mail xpfe/bootstrap/init.d ifdef MOZ_USE_OFFICIAL_BRANDING tier_99_dirs += other-licenses/branding/thunderbird/content @@ -393,8 +379,10 @@ endif # viewer ifneq (,$(ENABLE_TESTS)) +ifndef MOZ_ENABLE_LIBXUL tier_99_dirs += webshell/tests endif +endif # winembed, mfcembed ifeq ($(OS_ARCH),WINNT) @@ -479,6 +467,27 @@ ifdef MOZ_LDAP_XPCOM $(MAKE) -C directory/c-sdk $@ endif +ifdef MOZ_ENABLE_LIBXUL +tier_50: + @echo "tier_50: $(tier_50_dirs)" + @$(EXIT_ON_ERROR) \ + for d in $(tier_50_dirs); do \ + $(UPDATE_TITLE) \ + $(MAKE) -C $$d export; \ + done ; \ + $(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include ;\ + for d in $(tier_50_dirs); do \ + $(UPDATE_TITLE) \ + $(MAKE) -C $$d libs; \ + done + @echo "Building tools from tier 2/9/50" + @$(EXIT_ON_ERROR) \ + for d in $(tier_2_dirs) $(tier_9_dirs) $(tier_50_dirs); do \ + $(UPDATE_TITLE) \ + $(MAKE) -C $$d tools; \ + done; +endif + tier_%: @echo "$@: $($@_dirs)" @$(EXIT_ON_ERROR) \ diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index 096049a980f..6380d0d9d44 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -591,6 +591,7 @@ xpcom/sample/Makefile xpcom/threads/Makefile xpcom/tools/Makefile xpcom/tools/registry/Makefile +xpcom/stub/Makefile xpcom/windbgdlg/Makefile $MAKEFILES_libreg $MAKEFILES_libjar diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in index 8149a7c8739..cab62453265 100644 --- a/mozilla/caps/src/Makefile.in +++ b/mozilla/caps/src/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsSecurityManagerModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = caps.pkg diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index c2031e77fce..bea0a2f81dc 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -335,7 +335,11 @@ ZLIB_LIBS = @ZLIB_LIBS@ ZLIB_REQUIRES = else ZLIB_CFLAGS = @MOZ_ZLIB_CFLAGS@ -ZLIB_LIBS = @MOZ_ZLIB_LIBS@ +ifdef MOZ_ENABLE_LIBXUL +MOZ_ZLIB_LIBS = @MOZ_ZLIB_LIBS@ +else +ZLIB_LIBS = @MOZ_ZLIB_LIBS@ +endif ZLIB_REQUIRES = zlib endif diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 88ef9255dbb..ca3cc07f5a8 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -413,6 +413,7 @@ endif EXPORT_LIBRARY= FORCE_STATIC_LIB=1 _ENABLE_PIC=1 +SHORT_LIBNAME= endif endif @@ -459,6 +460,26 @@ ifdef MOZ_PROFILE_USE DSO_PIC_CFLAGS += $(PROFILE_USE_CFLAGS) endif +# Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're +# building libxul libraries +ifdef MOZ_ENABLE_LIBXUL +ifdef LIBXUL_LIBRARY +DEFINES += \ + -D_IMPL_NS_COM \ + -DEXPORT_XPT_API \ + -DEXPORT_XPTC_API \ + -DEXPORT_XPTI_API \ + -D_IMPL_NS_COM_OBSOLETE \ + -D_IMPL_NS_GFX \ + -D_IMPL_NS_WIDGET \ + $(NULL) + +ifndef MOZ_NATIVE_ZLIB +DEFINES += -DZLIB_INTERNAL +endif +endif +endif + # Force _all_ exported methods to be |_declspec(dllexport)| when we're # building them into the executable. ifeq ($(OS_ARCH),WINNT) diff --git a/mozilla/configure.in b/mozilla/configure.in index 8b5440e9b54..ffb76def106 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -5457,7 +5457,6 @@ fi if test -n "$MOZ_ENABLE_LIBXUL"; then XPCOM_LIBS="$LIBXUL_LIBS" AC_DEFINE(MOZ_ENABLE_LIBXUL) - MOZ_ZLIB_LIBS= else XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS" fi diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in index c332e52cf1e..4b89cb5187a 100644 --- a/mozilla/docshell/build/Makefile.in +++ b/mozilla/docshell/build/Makefile.in @@ -85,7 +85,7 @@ EXPORTS = \ nsDocShellCID.h \ $(NULL) -ifeq ($(OS_ARCH),WINNT) +ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) EXTRA_DSO_LIBS = gkgfx endif diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in index 4652fd2d0d0..3535039c60f 100644 --- a/mozilla/editor/libeditor/build/Makefile.in +++ b/mozilla/editor/libeditor/build/Makefile.in @@ -53,7 +53,9 @@ GRE_MODULE = 1 PACKAGE_FILE = editor.pkg +ifndef MOZ_ENABLE_LIBXUL EXTRA_DSO_LIBS = gkgfx +endif EXTRA_DSO_LDOPTS = \ $(LIBS_DIR) \ diff --git a/mozilla/gfx/Makefile.in b/mozilla/gfx/Makefile.in index 9d167789d4f..1fe2b7d1879 100644 --- a/mozilla/gfx/Makefile.in +++ b/mozilla/gfx/Makefile.in @@ -46,7 +46,7 @@ MODULE = gfx DIRS = public idl src ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS += tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index bdd1a80d194..3a3cc02286e 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -46,6 +46,7 @@ MODULE = gfx LIBRARY_NAME = gkgfx EXPORT_LIBRARY = 1 GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = gfx.pkg diff --git a/mozilla/gfx/src/beos/Makefile.in b/mozilla/gfx/src/beos/Makefile.in index e116fc61443..958f3f847a4 100644 --- a/mozilla/gfx/src/beos/Makefile.in +++ b/mozilla/gfx/src/beos/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxBeOSModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = gfxbeos.pkg diff --git a/mozilla/gfx/src/cairo/Makefile.in b/mozilla/gfx/src/cairo/Makefile.in index ced41d14d40..44898fab9cd 100644 --- a/mozilla/gfx/src/cairo/Makefile.in +++ b/mozilla/gfx/src/cairo/Makefile.in @@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index 84b419cfcbc..daa04ed727d 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/gfx/src/gtk/Makefile.in @@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxGTKModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/gfx/src/mac/Makefile.in b/mozilla/gfx/src/mac/Makefile.in index 68b3f682f21..92720d9e9ba 100644 --- a/mozilla/gfx/src/mac/Makefile.in +++ b/mozilla/gfx/src/mac/Makefile.in @@ -48,7 +48,8 @@ EXPORT_LIBRARY = 1 MODULE = gfx IS_COMPONENT = 1 MODULE_NAME = nsGfxMacModule -GRE_MODULE = 1 +GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = gfxmac.pkg diff --git a/mozilla/gfx/src/os2/Makefile.in b/mozilla/gfx/src/os2/Makefile.in index fb3af30bb0d..8fc00bfd5b4 100644 --- a/mozilla/gfx/src/os2/Makefile.in +++ b/mozilla/gfx/src/os2/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxOS2Module GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = gfxos2.pkg diff --git a/mozilla/gfx/src/photon/Makefile.in b/mozilla/gfx/src/photon/Makefile.in index d2ef3b1e0c7..1228ba5c500 100644 --- a/mozilla/gfx/src/photon/Makefile.in +++ b/mozilla/gfx/src/photon/Makefile.in @@ -47,6 +47,7 @@ LIBRARY_NAME = gfx_photon EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxPhModule +LIBXUL_LIBRARY = 1 PACKAGE_FILE = photon.pkg diff --git a/mozilla/gfx/src/ps/Makefile.in b/mozilla/gfx/src/ps/Makefile.in index b3cdba30e50..2abe258443b 100644 --- a/mozilla/gfx/src/ps/Makefile.in +++ b/mozilla/gfx/src/ps/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxPSModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = mozutil_s REQUIRES = xpcom \ string \ diff --git a/mozilla/gfx/src/qt/Makefile.in b/mozilla/gfx/src/qt/Makefile.in index 80140828cf5..3a0830a17f3 100644 --- a/mozilla/gfx/src/qt/Makefile.in +++ b/mozilla/gfx/src/qt/Makefile.in @@ -50,6 +50,7 @@ EXPORT_LIBRARY = 1 GRE_MODULE = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxQtModule +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/gfx/src/shared/Makefile.in b/mozilla/gfx/src/shared/Makefile.in index 973c0e0c5ae..8a7c4fd903d 100644 --- a/mozilla/gfx/src/shared/Makefile.in +++ b/mozilla/gfx/src/shared/Makefile.in @@ -46,6 +46,7 @@ MODULE = gfx LIBRARY_NAME = gfxshared_s FORCE_STATIC_LIB=1 EXPORT_LIBRARY=1 +LIBXUL_LIBRARY = 1 REQUIRES= \ xpcom \ diff --git a/mozilla/gfx/src/windows/Makefile.in b/mozilla/gfx/src/windows/Makefile.in index 79e817f05cd..fa4140e2489 100644 --- a/mozilla/gfx/src/windows/Makefile.in +++ b/mozilla/gfx/src/windows/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in index 13a2ec58c5c..06476fb16c6 100644 --- a/mozilla/gfx/src/xlib/Makefile.in +++ b/mozilla/gfx/src/xlib/Makefile.in @@ -50,6 +50,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxXlibModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/gfx/src/xlibrgb/Makefile.in b/mozilla/gfx/src/xlibrgb/Makefile.in index 36e284af3b4..28da59ffaea 100644 --- a/mozilla/gfx/src/xlibrgb/Makefile.in +++ b/mozilla/gfx/src/xlibrgb/Makefile.in @@ -46,6 +46,7 @@ MODULE = xlibrgb LIBRARY_NAME = xlibrgb EXPORT_LIBRARY = 1 GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = xlibrgb.pkg diff --git a/mozilla/gfx/src/xprint/Makefile.in b/mozilla/gfx/src/xprint/Makefile.in index 8360f414b7e..1512d994aff 100644 --- a/mozilla/gfx/src/xprint/Makefile.in +++ b/mozilla/gfx/src/xprint/Makefile.in @@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxXprintModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gfxshared_s gkgfx diff --git a/mozilla/gfx/src/xprintutil/Makefile.in b/mozilla/gfx/src/xprintutil/Makefile.in index 099ecf6e401..784d6385597 100644 --- a/mozilla/gfx/src/xprintutil/Makefile.in +++ b/mozilla/gfx/src/xprintutil/Makefile.in @@ -47,6 +47,7 @@ MODULE = xprintutil LIBRARY_NAME = xprintutil FORCE_STATIC_LIB= 1 EXPORT_LIBRARY=1 +LIBXUL_LIBRARY = 1 CSRCS = \ xprintutil.c \ diff --git a/mozilla/intl/build/Makefile.in b/mozilla/intl/build/Makefile.in index 0b45dc0f227..7c9ea11d100 100644 --- a/mozilla/intl/build/Makefile.in +++ b/mozilla/intl/build/Makefile.in @@ -47,6 +47,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsI18nModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = intl.pkg PACKAGE_VARS = MOZ_MATHML diff --git a/mozilla/intl/chardet/Makefile.in b/mozilla/intl/chardet/Makefile.in index c5eb4f88ca1..29b2caf9b54 100644 --- a/mozilla/intl/chardet/Makefile.in +++ b/mozilla/intl/chardet/Makefile.in @@ -46,7 +46,7 @@ DIRS = public src ifeq ($(OS_ARCH),WINNT) ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS += tests endif endif diff --git a/mozilla/intl/chardet/src/Makefile.in b/mozilla/intl/chardet/src/Makefile.in index cdbc7cea0f3..9f28a3392b4 100644 --- a/mozilla/intl/chardet/src/Makefile.in +++ b/mozilla/intl/chardet/src/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = chardet LIBRARY_NAME = chardet_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/compatibility/src/Makefile.in b/mozilla/intl/compatibility/src/Makefile.in index 3f47d681a2e..8f8d35e00bf 100644 --- a/mozilla/intl/compatibility/src/Makefile.in +++ b/mozilla/intl/compatibility/src/Makefile.in @@ -47,6 +47,7 @@ LIBRARY_NAME = intlcmpt EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = I18nCompatibility +LIBXUL_LIBRARY = 1 PACKAGE_FILE = intlcmpt.pkg diff --git a/mozilla/intl/locale/src/Makefile.in b/mozilla/intl/locale/src/Makefile.in index a464bcc85cb..5159401dbeb 100644 --- a/mozilla/intl/locale/src/Makefile.in +++ b/mozilla/intl/locale/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = locale LIBRARY_NAME = nslocale_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ gfx \ string \ diff --git a/mozilla/intl/locale/src/mac/Makefile.in b/mozilla/intl/locale/src/mac/Makefile.in index 513a93fa479..1c7113fddff 100644 --- a/mozilla/intl/locale/src/mac/Makefile.in +++ b/mozilla/intl/locale/src/mac/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = locale LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/locale/src/os2/Makefile.in b/mozilla/intl/locale/src/os2/Makefile.in index 85b0119b7b9..543890ed334 100644 --- a/mozilla/intl/locale/src/os2/Makefile.in +++ b/mozilla/intl/locale/src/os2/Makefile.in @@ -46,6 +46,7 @@ MODULE = locale LIBRARY_NAME = platlocale_s EXPORT_LIBRARY = 1 FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/locale/src/unix/Makefile.in b/mozilla/intl/locale/src/unix/Makefile.in index e26390619a1..f8eaecd71fd 100644 --- a/mozilla/intl/locale/src/unix/Makefile.in +++ b/mozilla/intl/locale/src/unix/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = locale LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB= 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/locale/src/windows/Makefile.in b/mozilla/intl/locale/src/windows/Makefile.in index 97194ee9cdc..7a2534d96ea 100644 --- a/mozilla/intl/locale/src/windows/Makefile.in +++ b/mozilla/intl/locale/src/windows/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = locale LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/lwbrk/Makefile.in b/mozilla/intl/lwbrk/Makefile.in index a3971c5451a..03801c0cc16 100644 --- a/mozilla/intl/lwbrk/Makefile.in +++ b/mozilla/intl/lwbrk/Makefile.in @@ -46,7 +46,7 @@ MODULE = lwbrk DIRS = idl public src ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS += tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/lwbrk/src/Makefile.in b/mozilla/intl/lwbrk/src/Makefile.in index 2cb4cb47c8e..2354d5883dc 100644 --- a/mozilla/intl/lwbrk/src/Makefile.in +++ b/mozilla/intl/lwbrk/src/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = lwbrk LIBRARY_NAME = lwbrk_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/strres/Makefile.in b/mozilla/intl/strres/Makefile.in index 779ed99281a..2cd47f09c92 100644 --- a/mozilla/intl/strres/Makefile.in +++ b/mozilla/intl/strres/Makefile.in @@ -46,7 +46,7 @@ MODULE = intl DIRS = public src ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS = tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/strres/src/Makefile.in b/mozilla/intl/strres/src/Makefile.in index 73dc8b3adef..30a7502ad4c 100644 --- a/mozilla/intl/strres/src/Makefile.in +++ b/mozilla/intl/strres/src/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = intl LIBRARY_NAME = strres_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/uconv/Makefile.in b/mozilla/intl/uconv/Makefile.in index 11cd7adb545..7503e3191ea 100644 --- a/mozilla/intl/uconv/Makefile.in +++ b/mozilla/intl/uconv/Makefile.in @@ -71,7 +71,7 @@ endif ifeq ($(OS_ARCH),WINNT) ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS = tests endif endif diff --git a/mozilla/intl/uconv/native/Makefile.in b/mozilla/intl/uconv/native/Makefile.in index 829e5b32f03..a84f407c776 100644 --- a/mozilla/intl/uconv/native/Makefile.in +++ b/mozilla/intl/uconv/native/Makefile.in @@ -46,6 +46,7 @@ MODULE = ucnative LIBRARY_NAME = ucnative_s FORCE_STATIC_LIB=1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in index 16e162b9dee..52ec7440eac 100644 --- a/mozilla/intl/uconv/src/Makefile.in +++ b/mozilla/intl/uconv/src/Makefile.in @@ -48,7 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsUConvModule GRE_MODULE = 1 - +LIBXUL_LIBRARY = 1 ifneq ($(OS_ARCH),WINNT) # To avoid conflict with OS/2 system uconv.dll SHORT_LIBNAME = mozuconv diff --git a/mozilla/intl/uconv/ucvcn/Makefile.in b/mozilla/intl/uconv/ucvcn/Makefile.in index f058e885af2..59aeb1f97b3 100644 --- a/mozilla/intl/uconv/ucvcn/Makefile.in +++ b/mozilla/intl/uconv/ucvcn/Makefile.in @@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvcn LIBRARY_NAME = ucvcn_s FORCE_STATIC_LIB=1 -MODULE_NAME = nsUCvCnModule +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ unicharutil \ diff --git a/mozilla/intl/uconv/ucvibm/Makefile.in b/mozilla/intl/uconv/ucvibm/Makefile.in index fee60377fb9..1cb318846ab 100644 --- a/mozilla/intl/uconv/ucvibm/Makefile.in +++ b/mozilla/intl/uconv/ucvibm/Makefile.in @@ -46,7 +46,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvibm LIBRARY_NAME = ucvibm_s FORCE_STATIC_LIB = 1 -MODULE_NAME = nsUCvIBMModule +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ uconv \ $(NULL) diff --git a/mozilla/intl/uconv/ucvja/Makefile.in b/mozilla/intl/uconv/ucvja/Makefile.in index ce248d25a84..db39a5f17a0 100644 --- a/mozilla/intl/uconv/ucvja/Makefile.in +++ b/mozilla/intl/uconv/ucvja/Makefile.in @@ -45,10 +45,9 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvja LIBRARY_NAME = ucvja_s -#EXPORT_LIBRARY = 1 -#IS_COMPONENT = 1 FORCE_STATIC_LIB = 1 -MODULE_NAME = nsUCvJAModule +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ uconv \ diff --git a/mozilla/intl/uconv/ucvko/Makefile.in b/mozilla/intl/uconv/ucvko/Makefile.in index de24c58d60d..0a972cd5c82 100644 --- a/mozilla/intl/uconv/ucvko/Makefile.in +++ b/mozilla/intl/uconv/ucvko/Makefile.in @@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvko LIBRARY_NAME = ucvko_s FORCE_STATIC_LIB=1 -MODULE_NAME = nsUCvKoModule +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ uconv \ diff --git a/mozilla/intl/uconv/ucvlatin/Makefile.in b/mozilla/intl/uconv/ucvlatin/Makefile.in index fdcbb2e32bf..3e7a3683622 100644 --- a/mozilla/intl/uconv/ucvlatin/Makefile.in +++ b/mozilla/intl/uconv/ucvlatin/Makefile.in @@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvlatin LIBRARY_NAME = ucvlatin_s FORCE_STATIC_LIB = 1 -MODULE_NAME = nsUCvLatinModule +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ uconv \ $(NULL) diff --git a/mozilla/intl/uconv/ucvmath/Makefile.in b/mozilla/intl/uconv/ucvmath/Makefile.in index 22a3c0adf84..9de7b819738 100644 --- a/mozilla/intl/uconv/ucvmath/Makefile.in +++ b/mozilla/intl/uconv/ucvmath/Makefile.in @@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsUCvMathModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = ucvmath.pkg diff --git a/mozilla/intl/uconv/ucvtw/Makefile.in b/mozilla/intl/uconv/ucvtw/Makefile.in index 9071360e044..c14e8222eea 100644 --- a/mozilla/intl/uconv/ucvtw/Makefile.in +++ b/mozilla/intl/uconv/ucvtw/Makefile.in @@ -44,8 +44,9 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvtw LIBRARY_NAME = ucvtw_s -MODULE_NAME = nsUCvTWModule FORCE_STATIC_LIB=1 +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ uconv \ $(NULL) diff --git a/mozilla/intl/uconv/ucvtw2/Makefile.in b/mozilla/intl/uconv/ucvtw2/Makefile.in index 276deef11b3..95f5533ffbc 100644 --- a/mozilla/intl/uconv/ucvtw2/Makefile.in +++ b/mozilla/intl/uconv/ucvtw2/Makefile.in @@ -44,10 +44,9 @@ include $(DEPTH)/config/autoconf.mk MODULE = ucvtw2 LIBRARY_NAME = ucvtw2_s -#EXPORT_LIBRARY = 1 -#IS_COMPONENT = 1 FORCE_STATIC_LIB=1 -MODULE_NAME = nsUCvTW2Module +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ uconv \ $(NULL) diff --git a/mozilla/intl/uconv/util/Makefile.in b/mozilla/intl/uconv/util/Makefile.in index 7424c361ccc..a2b241f31f1 100644 --- a/mozilla/intl/uconv/util/Makefile.in +++ b/mozilla/intl/uconv/util/Makefile.in @@ -45,8 +45,9 @@ include $(DEPTH)/config/autoconf.mk MODULE = uconv LIBRARY_NAME = ucvutil_s EXPORT_LIBRARY = 1 - FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 + MODULE_NAME = nsUCUtil REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/unicharutil/Makefile.in b/mozilla/intl/unicharutil/Makefile.in index fd1d658455b..34db46503c3 100644 --- a/mozilla/intl/unicharutil/Makefile.in +++ b/mozilla/intl/unicharutil/Makefile.in @@ -47,7 +47,7 @@ MODULE = unicharutil DIRS = idl public util src tables ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS = tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/unicharutil/src/Makefile.in b/mozilla/intl/unicharutil/src/Makefile.in index 43c727ee3a0..e031a7af62f 100644 --- a/mozilla/intl/unicharutil/src/Makefile.in +++ b/mozilla/intl/unicharutil/src/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = unicharutil LIBRARY_NAME = ucharucomp_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/intl/unicharutil/util/Makefile.in b/mozilla/intl/unicharutil/util/Makefile.in index 515916614ee..d44554e4738 100644 --- a/mozilla/intl/unicharutil/util/Makefile.in +++ b/mozilla/intl/unicharutil/util/Makefile.in @@ -40,23 +40,22 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -MODULE=unicharutil +include $(DEPTH)/config/autoconf.mk +MODULE=unicharutil +LIBRARY_NAME=unicharutil_s EXPORT_LIBRARY=1 -include $(DEPTH)/config/autoconf.mk +REQUIRES=xpcom \ + string \ + uconv \ + $(NULL) EXPORTS = \ nsUnicharUtils.h \ nsCompressedCharMap.h \ $(NULL) -LIBRARY_NAME=unicharutil_s -REQUIRES=xpcom \ - string \ - uconv \ - $(NULL) - CPPSRCS = \ nsUnicharUtils.cpp \ nsCompressedCharMap.cpp \ diff --git a/mozilla/ipc/ipcd/client/src/Makefile.in b/mozilla/ipc/ipcd/client/src/Makefile.in index b2854e35b14..503f83e81b4 100644 --- a/mozilla/ipc/ipcd/client/src/Makefile.in +++ b/mozilla/ipc/ipcd/client/src/Makefile.in @@ -48,6 +48,7 @@ LIBRARY_NAME = ipcdc EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = ipcdclient +LIBXUL_LIBRARY = 1 REQUIRES = \ xpcom \ diff --git a/mozilla/ipc/ipcd/extensions/dconnect/src/Makefile.in b/mozilla/ipc/ipcd/extensions/dconnect/src/Makefile.in index a9efaadff29..4cd9f150acd 100644 --- a/mozilla/ipc/ipcd/extensions/dconnect/src/Makefile.in +++ b/mozilla/ipc/ipcd/extensions/dconnect/src/Makefile.in @@ -47,7 +47,7 @@ MODULE = ipcd LIBRARY_NAME = ipcddconnect_s FORCE_STATIC_LIB = 1 MODULE_NAME = ipcd - +LIBXUL_LIBRARY = 1 FORCE_USE_PIC = 1 REQUIRES = \ diff --git a/mozilla/ipc/ipcd/extensions/lock/src/Makefile.in b/mozilla/ipc/ipcd/extensions/lock/src/Makefile.in index 26d943a8e20..578b530c1a0 100644 --- a/mozilla/ipc/ipcd/extensions/lock/src/Makefile.in +++ b/mozilla/ipc/ipcd/extensions/lock/src/Makefile.in @@ -49,7 +49,7 @@ MODULE = ipcd LIBRARY_NAME = ipcdlock_s FORCE_STATIC_LIB = 1 MODULE_NAME = ipcd - +LIBXUL_LIBRARY = 1 FORCE_USE_PIC = 1 REQUIRES = \ diff --git a/mozilla/ipc/ipcd/extensions/transmngr/build/Makefile.in b/mozilla/ipc/ipcd/extensions/transmngr/build/Makefile.in index 8727783943e..e1c14e2bb2c 100644 --- a/mozilla/ipc/ipcd/extensions/transmngr/build/Makefile.in +++ b/mozilla/ipc/ipcd/extensions/transmngr/build/Makefile.in @@ -47,6 +47,7 @@ LIBRARY_NAME = transmngr_client EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = transmngr +LIBXUL_LIBRARY = 1 REQUIRES = ipcd \ string \ diff --git a/mozilla/js/src/xpconnect/Makefile.in b/mozilla/js/src/xpconnect/Makefile.in index b1f01d060a1..40fc859789e 100644 --- a/mozilla/js/src/xpconnect/Makefile.in +++ b/mozilla/js/src/xpconnect/Makefile.in @@ -50,15 +50,16 @@ ifdef MOZ_JSLOADER DIRS += loader endif -DIRS += src shell +DIRS += src + +TOOL_DIRS += shell ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS += tests endif ifdef MOZ_XPCTOOLS -DIRS += tools +TOOL_DIRS += tools endif include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/js/src/xpconnect/loader/Makefile.in b/mozilla/js/src/xpconnect/loader/Makefile.in index 12f733f3800..fd5ad42e534 100644 --- a/mozilla/js/src/xpconnect/loader/Makefile.in +++ b/mozilla/js/src/xpconnect/loader/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = jsloader LIBRARY_NAME = jsloader_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ xpconnect \ diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in index 65ba4c75e49..01bbac52de0 100644 --- a/mozilla/js/src/xpconnect/src/Makefile.in +++ b/mozilla/js/src/xpconnect/src/Makefile.in @@ -51,10 +51,11 @@ SHORT_LIBNAME = xpconect IS_COMPONENT = 1 MODULE_NAME = xpconnect GRE_MODULE = 1 -ifeq ($(OS_ARCH),WINNT) +ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER) SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER) endif +LIBXUL_LIBRARY = 1 PACKAGE_FILE = xpconnect.pkg diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index e98451497a7..9f508751593 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -60,7 +60,9 @@ GRE_MODULE = 1 PACKAGE_FILE = layout.pkg PACKAGE_VARS += MOZ_XUL +ifndef MOZ_ENABLE_LIBXUL EXTRA_DSO_LIBS = gkgfx +endif ifdef MOZ_PERF_METRICS EXTRA_DSO_LIBS += mozutil_s endif diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in index 117e802beca..f55981b78fa 100644 --- a/mozilla/modules/libimg/png/Makefile.in +++ b/mozilla/modules/libimg/png/Makefile.in @@ -28,10 +28,10 @@ include $(DEPTH)/config/autoconf.mk MODULE = png LIBRARY_NAME = mozpng - ifeq ($(OS_ARCH),WINNT) LIBRARY_NAME = png endif +LIBXUL_LIBRARY = 1 REQUIRES = $(ZLIB_REQUIRES) \ $(NULL) diff --git a/mozilla/modules/libjar/Makefile.in b/mozilla/modules/libjar/Makefile.in index 852e9480e89..ffa2023de9f 100644 --- a/mozilla/modules/libjar/Makefile.in +++ b/mozilla/modules/libjar/Makefile.in @@ -50,10 +50,12 @@ DIRS = standalone # Make this a true dynamic component even in static builds because # this component is shared by installer +ifndef MOZ_ENABLE_LIBXUL MOZ_STATIC_COMPONENT_LIBS= BUILD_STATIC_LIBS= BUILD_SHARED_LIBS=1 endif +endif MODULE = jar LIBRARY_NAME = jar$(VERSION_NUMBER) @@ -61,6 +63,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsJarModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = libjar.pkg diff --git a/mozilla/modules/libpr0n/build/Makefile.in b/mozilla/modules/libpr0n/build/Makefile.in index e88f77e2f97..c275883f40b 100644 --- a/mozilla/modules/libpr0n/build/Makefile.in +++ b/mozilla/modules/libpr0n/build/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsImageLib2Module GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = imglib2.pkg diff --git a/mozilla/modules/libpr0n/decoders/bmp/Makefile.in b/mozilla/modules/libpr0n/decoders/bmp/Makefile.in index 2128bfd31cf..837986addcb 100644 --- a/mozilla/modules/libpr0n/decoders/bmp/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/bmp/Makefile.in @@ -47,6 +47,7 @@ MODULE = imgbmp LIBRARY_NAME = imgbmp_s FORCE_STATIC_LIB = 1 MODULE_NAME = nsBMPModule +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ gfx \ diff --git a/mozilla/modules/libpr0n/decoders/gif/Makefile.in b/mozilla/modules/libpr0n/decoders/gif/Makefile.in index 53dd7b0e649..ed89e104416 100644 --- a/mozilla/modules/libpr0n/decoders/gif/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/gif/Makefile.in @@ -46,6 +46,7 @@ MODULE = imggif LIBRARY_NAME = imggif_s FORCE_STATIC_LIB = 1 MODULE_NAME = nsGIFModule2 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpr0n/decoders/icon/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/Makefile.in index 7e27721bb7f..08fe12666c8 100644 --- a/mozilla/modules/libpr0n/decoders/icon/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/icon/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsIconDecoderModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = imgicon.pkg diff --git a/mozilla/modules/libpr0n/decoders/icon/gtk/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/gtk/Makefile.in index faa6a3709a8..774953bb9c9 100644 --- a/mozilla/modules/libpr0n/decoders/icon/gtk/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/icon/gtk/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgicongtk_s +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpr0n/decoders/icon/mac/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/mac/Makefile.in index 8bf16116d50..8c6c68388b9 100644 --- a/mozilla/modules/libpr0n/decoders/icon/mac/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/icon/mac/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgiconmac_s +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpr0n/decoders/icon/os2/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/os2/Makefile.in index 58b316c824a..6921dc57a66 100644 --- a/mozilla/modules/libpr0n/decoders/icon/os2/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/icon/os2/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgiconos2_s +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in index 78a8b53329a..8b558c4bcd1 100644 --- a/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgiconwin_s +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in b/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in index 341be2155ab..8dc8d2ea1b9 100644 --- a/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in @@ -30,7 +30,7 @@ MODULE = imgjpeg LIBRARY_NAME = imgjpeg_s FORCE_STATIC_LIB = 1 MODULE_NAME = nsJPEGDecoderModule - +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpr0n/decoders/png/Makefile.in b/mozilla/modules/libpr0n/decoders/png/Makefile.in index 6690344c7a0..5573ac9e4c6 100644 --- a/mozilla/modules/libpr0n/decoders/png/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/png/Makefile.in @@ -46,6 +46,7 @@ MODULE = imgpng LIBRARY_NAME = imgpng_s FORCE_STATIC_LIB = 1 MODULE_NAME = nsPNGDecoderModule +LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gkgfx diff --git a/mozilla/modules/libpr0n/decoders/xbm/Makefile.in b/mozilla/modules/libpr0n/decoders/xbm/Makefile.in index 47ba5d91b3d..51f04bf739b 100644 --- a/mozilla/modules/libpr0n/decoders/xbm/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/xbm/Makefile.in @@ -47,6 +47,7 @@ MODULE = imgxbm LIBRARY_NAME = imgxbm_s FORCE_STATIC_LIB = 1 MODULE_NAME = nsXBMModule +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ gfx \ diff --git a/mozilla/modules/libpr0n/src/Makefile.in b/mozilla/modules/libpr0n/src/Makefile.in index 86a2f3e03ed..86132c583b6 100644 --- a/mozilla/modules/libpr0n/src/Makefile.in +++ b/mozilla/modules/libpr0n/src/Makefile.in @@ -47,6 +47,7 @@ LIBRARY_NAME = imglib2_s FORCE_STATIC_LIB = 1 MODULE_NAME = nsImageLib2Module GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in index 15457bd2f12..2cb3d602fe3 100644 --- a/mozilla/modules/libpref/src/Makefile.in +++ b/mozilla/modules/libpref/src/Makefile.in @@ -31,10 +31,11 @@ LIBRARY_NAME = pref EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsPrefModule -ifeq ($(OS_ARCH),WINNT) +ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) LIBRARY_NAME = xppref$(MOZ_BITS) endif GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ xpcom_obsolete \ diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 66e755d2de9..54c5965798c 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsPluginModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = plugin.pkg PACKAGE_VARS += MOZ_ENABLE_GTK diff --git a/mozilla/netwerk/Makefile.in b/mozilla/netwerk/Makefile.in index 0f4f6b73139..32fd1d28e9f 100644 --- a/mozilla/netwerk/Makefile.in +++ b/mozilla/netwerk/Makefile.in @@ -60,7 +60,7 @@ DIRS = \ $(NULL) ifdef ENABLE_TESTS -DIRS += test +TOOL_DIRS += test endif EXPORTS = necko-config.h diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in index a12104f134d..8bd7755b1dc 100644 --- a/mozilla/netwerk/base/src/Makefile.in +++ b/mozilla/netwerk/base/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckobase_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ mimetype \ diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in index bb5e2be6f28..32e58f041ff 100644 --- a/mozilla/netwerk/build/Makefile.in +++ b/mozilla/netwerk/build/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = necko_core_and_primary_protocols GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = necko.pkg diff --git a/mozilla/netwerk/build2/Makefile.in b/mozilla/netwerk/build2/Makefile.in index bb8aa151332..3b284a7f597 100644 --- a/mozilla/netwerk/build2/Makefile.in +++ b/mozilla/netwerk/build2/Makefile.in @@ -54,6 +54,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = necko_secondary_protocols GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = necko2.pkg diff --git a/mozilla/netwerk/cache/src/Makefile.in b/mozilla/netwerk/cache/src/Makefile.in index 1b338141559..c295d328ef2 100644 --- a/mozilla/netwerk/cache/src/Makefile.in +++ b/mozilla/netwerk/cache/src/Makefile.in @@ -46,6 +46,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = nkcache LIBRARY_NAME = nkcache_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ necko \ diff --git a/mozilla/netwerk/cookie/src/Makefile.in b/mozilla/netwerk/cookie/src/Makefile.in index a76d519b2dc..06130224257 100644 --- a/mozilla/netwerk/cookie/src/Makefile.in +++ b/mozilla/netwerk/cookie/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckocookie_s FORCE_STATIC_LIB = 1 +LIBXUL_LIBRARY = 1 + REQUIRES = \ xpcom \ string \ diff --git a/mozilla/netwerk/dns/src/Makefile.in b/mozilla/netwerk/dns/src/Makefile.in index 989df460242..45bf63a1879 100644 --- a/mozilla/netwerk/dns/src/Makefile.in +++ b/mozilla/netwerk/dns/src/Makefile.in @@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckodns_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ pref \ diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in index ad1a963cd83..c89cfe3a455 100644 --- a/mozilla/netwerk/mime/src/Makefile.in +++ b/mozilla/netwerk/mime/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = mimetype LIBRARY_NAME = nkmime_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ necko \ diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in index 68ea2b4738e..37e1ccea698 100644 --- a/mozilla/netwerk/protocol/about/src/Makefile.in +++ b/mozilla/netwerk/protocol/about/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkabout_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ nkcache \ diff --git a/mozilla/netwerk/protocol/data/src/Makefile.in b/mozilla/netwerk/protocol/data/src/Makefile.in index eff4ddc8791..fe0349cd167 100644 --- a/mozilla/netwerk/protocol/data/src/Makefile.in +++ b/mozilla/netwerk/protocol/data/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkdata_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ $(NULL) diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in index f45a5170597..ce232d7b6b4 100644 --- a/mozilla/netwerk/protocol/file/src/Makefile.in +++ b/mozilla/netwerk/protocol/file/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkfile_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ mimetype \ diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in index f221320e012..dc012cd4990 100644 --- a/mozilla/netwerk/protocol/ftp/src/Makefile.in +++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkftp_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ mimetype \ diff --git a/mozilla/netwerk/protocol/gopher/src/Makefile.in b/mozilla/netwerk/protocol/gopher/src/Makefile.in index 1f25610c347..541324d50e8 100644 --- a/mozilla/netwerk/protocol/gopher/src/Makefile.in +++ b/mozilla/netwerk/protocol/gopher/src/Makefile.in @@ -45,12 +45,14 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko2 LIBRARY_NAME = nkgopher_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ necko \ string \ mimetype \ pref \ - intl \ + intl \ $(NULL) CPPSRCS = \ diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in index 0c7d2ed30da..d82c92631b2 100644 --- a/mozilla/netwerk/protocol/http/src/Makefile.in +++ b/mozilla/netwerk/protocol/http/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkhttp_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ pref \ diff --git a/mozilla/netwerk/protocol/keyword/src/Makefile.in b/mozilla/netwerk/protocol/keyword/src/Makefile.in index 51ecc58f38a..2f148a62235 100644 --- a/mozilla/netwerk/protocol/keyword/src/Makefile.in +++ b/mozilla/netwerk/protocol/keyword/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkkeyword_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ pref \ diff --git a/mozilla/netwerk/protocol/res/src/Makefile.in b/mozilla/netwerk/protocol/res/src/Makefile.in index 15ad86c4861..6bdbff6f324 100644 --- a/mozilla/netwerk/protocol/res/src/Makefile.in +++ b/mozilla/netwerk/protocol/res/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkres_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ uconv \ diff --git a/mozilla/netwerk/protocol/viewsource/src/Makefile.in b/mozilla/netwerk/protocol/viewsource/src/Makefile.in index be3c2974fd1..0bc5f419eba 100644 --- a/mozilla/netwerk/protocol/viewsource/src/Makefile.in +++ b/mozilla/netwerk/protocol/viewsource/src/Makefile.in @@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko2 LIBRARY_NAME = nkviewsource_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ necko \ diff --git a/mozilla/netwerk/socket/base/Makefile.in b/mozilla/netwerk/socket/base/Makefile.in index af92665f344..7a4a9074606 100755 --- a/mozilla/netwerk/socket/base/Makefile.in +++ b/mozilla/netwerk/socket/base/Makefile.in @@ -46,6 +46,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko XPIDL_MODULE = necko_socket LIBRARY_NAME = neckosocket_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ $(NULL) diff --git a/mozilla/netwerk/streamconv/Makefile.in b/mozilla/netwerk/streamconv/Makefile.in index a39a79bf3d9..3c05b0e5205 100644 --- a/mozilla/netwerk/streamconv/Makefile.in +++ b/mozilla/netwerk/streamconv/Makefile.in @@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src converters ifdef ENABLE_TESTS -DIRS += test +TOOL_DIRS += test endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/streamconv/converters/Makefile.in b/mozilla/netwerk/streamconv/converters/Makefile.in index 5cfd6275143..b752d322e5e 100644 --- a/mozilla/netwerk/streamconv/converters/Makefile.in +++ b/mozilla/netwerk/streamconv/converters/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkcnvts_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ mimetype \ diff --git a/mozilla/netwerk/streamconv/src/Makefile.in b/mozilla/netwerk/streamconv/src/Makefile.in index 5968b5b19d8..8e85bf1be31 100644 --- a/mozilla/netwerk/streamconv/src/Makefile.in +++ b/mozilla/netwerk/streamconv/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkconv_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ $(NULL) diff --git a/mozilla/parser/htmlparser/Makefile.in b/mozilla/parser/htmlparser/Makefile.in index 4cc4141d924..2c8d44fd6cd 100644 --- a/mozilla/parser/htmlparser/Makefile.in +++ b/mozilla/parser/htmlparser/Makefile.in @@ -46,7 +46,7 @@ MODULE = htmlparser DIRS = public src ifdef ENABLE_TESTS -DIRS += robot tests +TOOL_DIRS += robot tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index ae8db0d55d2..2525e8c7111 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -48,6 +48,7 @@ IS_COMPONENT = 1 MODULE_NAME = nsParserModule SHORT_LIBNAME = gkparser GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = parser.pkg diff --git a/mozilla/rdf/Makefile.in b/mozilla/rdf/Makefile.in index bc635f42936..f6a5918512a 100644 --- a/mozilla/rdf/Makefile.in +++ b/mozilla/rdf/Makefile.in @@ -46,7 +46,7 @@ MODULE = rdf DIRS = base util datasource resources build ifdef ENABLE_TESTS -DIRS += tests +TOOL_DIRS += tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/base/src/Makefile.in b/mozilla/rdf/base/src/Makefile.in index 6fc30dd74c4..85671935bb7 100644 --- a/mozilla/rdf/base/src/Makefile.in +++ b/mozilla/rdf/base/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdf LIBRARY_NAME = rdfbase_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ rdfutil \ diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in index 3754a0e3196..29bac1a4dd2 100644 --- a/mozilla/rdf/build/Makefile.in +++ b/mozilla/rdf/build/Makefile.in @@ -50,6 +50,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsRDFModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = rdf.pkg diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in index f0578b78dbe..861d73bc159 100644 --- a/mozilla/rdf/datasource/src/Makefile.in +++ b/mozilla/rdf/datasource/src/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdf LIBRARY_NAME = rdfdatasource_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ necko \ diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in index 65316db5254..154eed8eb19 100644 --- a/mozilla/toolkit/library/Makefile.in +++ b/mozilla/toolkit/library/Makefile.in @@ -52,7 +52,7 @@ REQUIRES = \ xpcom \ string \ xpcom_obsolete \ - zlib \ + $(ZLIB_REQUIRES) \ $(NULL) CPPSRCS = \ @@ -60,13 +60,21 @@ CPPSRCS = \ $(NULL) ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) -REQUIRES += libreg +REQUIRES += libreg widget gfx CPPSRCS += \ dlldeps.cpp \ dlldeps-obs.cpp \ - dlldeps-zlib.cpp \ + nsGFXDeps.cpp \ + nsDllMain.cpp \ $(NULL) + +ifndef MOZ_NATIVE_ZLIB +CPPSRCS += dlldeps-zlib.cpp +DEFINES += -DZLIB_INTERNAL +endif + +LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/windows endif ifeq ($(OS_ARCH),WINNT) @@ -74,29 +82,154 @@ DEFINES += -DZLIB_DLL=1 endif # dependent libraries -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcom_core.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xpcom_compat.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)mozz.$(LIB_SUFFIX) \ +STATIC_LIBS = \ + xpcom_core \ + xpcom_compat \ + unicharutil_s \ + ucvutil_s \ + gkgfx \ + gfxshared_s \ $(NULL) # component libraries -SHARED_LIBRARY_LIBS += \ - $(DIST)/lib/components/$(LIB_PREFIX)xpcom_compat_c.$(LIB_SUFFIX) \ +COMPONENT_LIBS += \ + xpcom_compat_c \ + xpconnect \ + necko \ + uconv \ + i18n \ + jar$(VERSION_NUMBER) \ + pref \ + caps \ + rdf \ + htmlpars \ + imglib2 \ + gkplugin \ + $(NULL) + +ifeq ($(OS_ARCH),WINNT) +COMPONENT_LIBS += intlcmpt +endif + +ifdef MOZ_MATHML +COMPONENT_LIBS += ucvmath +endif + +ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT)) +STATIC_LIBS += xlibrgb +endif + +ifdef MOZ_ENABLE_XPRINT +DEFINES += -DMOZ_ENABLE_XPRINT +COMPONENTS_LIBS += gfxxprint +endif + +ifdef MOZ_ENABLE_XLIB +STATIC_LIBS += xlibxtbin +endif + +ifdef MOZ_ENABLE_GTK +STATIC_LIBS += gtksuperwin +COMPONENT_LIBS += widget_gtk +endif + +ifdef MOZ_ENABLE_GTK2 +COMPONENT_LIBS += widget_gtk2 +endif + +ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) +STATIC_LIBS += gtkxtbin +endif + +ifdef MOZ_IPCD +DEFINES += -DMOZ_IPCD +COMPONENT_LIBS += ipcdc +endif + +ifneq (,$(strip $(filter data keyword gopher viewsource,$(NECKO_PROTOCOLS)))) +DEFINES += -DNECKO2 +COMPONENT_LIBS += necko2 +endif + +ifdef MOZ_ENABLE_POSTSCRIPT +DEFINES += -DMOZ_ENABLE_POSTSCRIPT +COMPONENT_LIBS += gfxps +endif +ifneq (,$(filter icon,$(MOZ_IMG_DECODERS))) +DEFINES += -DICON_DECODER +COMPONENT_LIBS += imgicon +endif +ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) +COMPONENT_LIBS += gkgfxwin gkwidget +endif +ifeq (beos,$(MOZ_WIDGET_TOOLKIT)) +COMPONENT_LIBS += gfx_beos widget_beos +endif +ifeq (os2,$(MOZ_WIDGET_TOOLKIT)) +COMPONENT_LIBS += gfx_os2 wdgtos2 +endif +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +COMPONENT_LIBS += gfx_mac widget_mac +endif + +ifdef MOZ_ENABLE_CAIRO_GFX +DEFINES += -DMOZ_ENABLE_CAIRO_GFX +COMPONENT_LIBS += gkgfxcairo +else + ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) + COMPONENT_LIBS += gfx_gtk + endif + ifdef MOZ_ENABLE_QT + COMPONENT_LIBS += gfx_qt + endif + ifdef MOZ_ENABLE_XLIB + COMPONENT_LIBS += gfx_xlib + endif + ifdef MOZ_ENABLE_PHOTON + COMPONENT_LIBS += gfx_photon + endif +endif + +ifdef MOZ_ENABLE_XLIB +COMPONENT_LIBS += widget_xlib +endif +ifdef MOZ_ENABLE_PHOTON +COMPONENT_LIBS += widget_photon +endif +ifdef MOZ_ENABLE_XREMOTE +COMPONENT_LIBS += xremote_client +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)) \ $(NULL) include $(topsrcdir)/config/rules.mk +EXTRA_DSO_LDOPTS += \ + $(JPEG_LIBS) \ + $(PNG_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NULL) + +ifdef MOZ_NATIVE_ZLIB +EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) +else +EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS) +endif + ifdef GC_LEAK_DETECTOR EXTRA_DSO_LIBS += boehm endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LIBS += macmorefiles_s -EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX) endif +EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) + OS_LIBS += $(LIBICONV) DEFINES += \ @@ -106,6 +239,8 @@ DEFINES += \ -DEXPORT_XPTC_API \ -DEXPORT_XPTI_API \ -D_IMPL_NS_COM_OBSOLETE \ + -D_IMPL_NS_GFX \ + -D_IMPL_NS_WIDGET \ $(NULL) EXTRA_DSO_LDOPTS += $(NSPR_LIBS) @@ -120,7 +255,7 @@ EXTRA_DSO_LDOPTS += -lbe endif ifeq ($(OS_ARCH),WINNT) -EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid) +EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool Comdlg32) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp) endif diff --git a/mozilla/toolkit/library/dlldeps-zlib.cpp b/mozilla/toolkit/library/dlldeps-zlib.cpp index 3d784e56a74..51568c9f7a4 100644 --- a/mozilla/toolkit/library/dlldeps-zlib.cpp +++ b/mozilla/toolkit/library/dlldeps-zlib.cpp @@ -38,7 +38,6 @@ // Force references to all of the symbols that we want exported from // the dll that are located in the .lib files we link with -#define ZLIB_INTERNAL #include "zlib.h" void xxxNeverCalledZLib() diff --git a/mozilla/toolkit/library/nsDllMain.cpp b/mozilla/toolkit/library/nsDllMain.cpp new file mode 100644 index 00000000000..fa21d46767d --- /dev/null +++ b/mozilla/toolkit/library/nsDllMain.cpp @@ -0,0 +1,80 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. This file was copied in part from + * mozilla/widget/src/windows/nsToolkit.cpp + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Benjamin Smedberg + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include +#include "nsToolkit.h" + +extern "C" { +extern HINSTANCE _pr_hInstance; +} + +#if defined(__GNUC__) +// If DllMain gets name mangled, it won't be seen. +extern "C" { +#endif + +BOOL APIENTRY DllMain( HINSTANCE hModule, + DWORD reason, + LPVOID lpReserved ) +{ + switch( reason ) { + case DLL_PROCESS_ATTACH: + nsToolkit::Startup(hModule); + _pr_hInstance = hModule; + break; + + case DLL_THREAD_ATTACH: + break; + + case DLL_THREAD_DETACH: + break; + + case DLL_PROCESS_DETACH: + nsToolkit::Shutdown(); + _pr_hInstance = NULL; + break; + + } + + return TRUE; +} + +#if defined(__GNUC__) +} // extern "C" +#endif diff --git a/mozilla/toolkit/library/nsGFXDeps.cpp b/mozilla/toolkit/library/nsGFXDeps.cpp new file mode 100644 index 00000000000..8d307744cc6 --- /dev/null +++ b/mozilla/toolkit/library/nsGFXDeps.cpp @@ -0,0 +1,66 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Gecko embedding code. + * + * The Initial Developer of the Original Code is + * Benjamin Smedberg . + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsRegion.h" + +void xxxGFXNeverCalled() +{ + nsRegion a; + nsRect r; + nsRegion b(r); + nsRegion c(a); + c.And(a,b); + c.And(a,r); + c.And(r,a); + c.Or(a,b); + c.Or(a,r); + c.Sub(a,b); + c.Sub(r,a); + c.IsEmpty(); + c.GetBounds(); + c.GetNumRects(); + c.MoveBy(0,0); + c.MoveBy(nsPoint()); + c.SetEmpty(); + c.SimplifyInward(0); + c.SimplifyOutward(0); + + + nsRegionRectIterator i(a); + i.Next(); + i.Prev(); + i.Reset(); +} diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp index 583ff4e9038..f68970c0abe 100644 --- a/mozilla/toolkit/library/nsStaticXULComponents.cpp +++ b/mozilla/toolkit/library/nsStaticXULComponents.cpp @@ -45,8 +45,117 @@ #define NSGETMODULE(_name) _name##_NSGetmodule -#define XUL_MODULES \ - MODULE(xpcomObsoleteModule) \ +#ifdef MOZ_MATHML +#define MATHML_MODULES MODULE(nsUCvMathModule) +#else +#define MATHML_MODULES +#endif + +#ifdef XP_WIN +#define INTL_COMPAT_MODULES MODULE(I18nCompatibility) +#else +#define INTL_COMPAT_MODULES +#endif + +#ifdef NECKO2 +#define NECKO2_MODULES MODULE(necko_secondary_protocols) +#else +#define NECKO2_MODULES +#endif + +#ifdef MOZ_IPCD +#define IPC_MODULE MODULE(ipcdclient) +#else +#define IPC_MODULE +#endif + +#ifdef MOZ_ENABLE_POSTSCRIPT +#define POSTSCRIPT_MODULES MODULE(nsGfxPSModule) +#else +#define POSTSCRIPT_MODULES +#endif + +#if MOZ_WIDGET_TOOLKIT==windows +# define GFX_MODULES MODULE(nsGfxModule) +# define WIDGET_MODULES MODULE(nsWidgetModule) +#elif MOZ_WIDGET_TOOLKIT==mac || MOZ_WIDGET_TOOLKIT=cocoa +# define GFX_MODULES MODULE(nsGfxMacModule) +# define WIDGET_MODULES MODULE(nsWidgetMacModule) +#elif MOZ_WIDGET_TOOLKIT==beos +# define GFX_MODULES MODULE(nsGfxBeOSModule) +# define WIDGET_MODULES MODULE(nsWidgetBeOSModule) +#elif MOZ_WIDGET_TOOLKIT==os2 +# define GFX_MODULES MODULE(nsGfxOS2Module) +# define WIDGET_MODULES MODULE(nsWidgetOS2Module) +#endif + +#ifdef MOZ_ENABLE_CAIRO_GFX +#define GFX_MODULES MODULE(nsGfxModule) +#else +# if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +# define GFX_MODULES MODULE(nsGfxGTKModule) +# elif defined(MOZ_WIDGET_QT) +# define GFX_MODULES MODULE(nsGfxQtModule) +# elif defined(MOZ_WIDGET_XLIB) +# define GFX_MODULES MODULE(nsGfxXlibModule) +# elif defined(MOZ_WIDGET_PHOTON) +# define GFX_MODULES MODULE(nsGfxPhModule) +# endif +#endif + +#ifdef ICON_DECODER +#define ICON_MODULE MODULE(nsIconDecoderModule) +#else +#define ICON_MODULE +#endif + +#ifdef MOZ_WIDGET_GTK +#define WIDGET_MODULES MODULE(nsWidgetGTKModule) +#endif +#ifdef MOZ_WIDGET_GTK2 +#define WIDGET_MODULES MODULE(nsWidgetGtk2Module) +#endif +#ifdef MOZ_WIDGET_XLIB +#define WIDGET_MODULES MODULE(nsWidgetXLIBModule) +#endif +#ifdef MOZ_WIDGET_PHOTON +#define WIDGET_MODULES MODULE(nsWidgetPhModule) +#endif + +#ifdef MOZ_ENABLE_XPRINT +#define XPRINT_MODULES MODULE(nsGfxXprintModule) +#else +#define XPRINT_MODULES +#endif + +#ifdef MOZ_ENABLE_XREMOTE +#define XREMOTE_MODULES MODULE(XRemoteClientModule) +#else +#define XREMOTE_MODULES +#endif + +#define XUL_MODULES \ + MODULE(xpcomObsoleteModule) \ + MODULE(xpconnect) \ + MATHML_MODULES \ + MODULE(nsUConvModule) \ + MODULE(nsI18nModule) \ + INTL_COMPAT_MODULES \ + MODULE(necko_core_and_primary_protocols) \ + NECKO2_MODULES \ + IPC_MODULE \ + MODULE(nsJarModule) \ + MODULE(nsPrefModule) \ + MODULE(nsSecurityManagerModule) \ + MODULE(nsRDFModule) \ + MODULE(nsParserModule) \ + POSTSCRIPT_MODULES \ + GFX_MODULES \ + WIDGET_MODULES \ + XREMOTE_MODULES \ + MODULE(nsImageLib2Module) \ + ICON_MODULE \ + MODULE(nsPluginModule) \ /* end of list */ #define MODULE(_name) \ diff --git a/mozilla/tools/trace-malloc/lib/Makefile.in b/mozilla/tools/trace-malloc/lib/Makefile.in index bee828cbeaf..a59f99bbb42 100644 --- a/mozilla/tools/trace-malloc/lib/Makefile.in +++ b/mozilla/tools/trace-malloc/lib/Makefile.in @@ -46,6 +46,7 @@ MODULE = tracemalloc LIBRARY_NAME = tracemalloc EXPORT_LIBRARY = 1 DEFFILE = $(srcdir)/tm.def +LIBXUL_LIBRARY = 1 REQUIRES = xpcom diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in index cbcf0f9a110..9e2e9de2f27 100644 --- a/mozilla/widget/src/beos/Makefile.in +++ b/mozilla/widget/src/beos/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetBeOSModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = widget_beos.pkg diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in index 41e84bba7df..dd06f861b0f 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/widget/src/build/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 RESFILE = widget.res MODULE_NAME = nsWidgetModule +LIBXUL_LIBRARY = 1 PACKAGE_FILE = widget_win.pkg diff --git a/mozilla/widget/src/cocoa/Makefile.in b/mozilla/widget/src/cocoa/Makefile.in index 73500e6c83f..a5248e159bc 100644 --- a/mozilla/widget/src/cocoa/Makefile.in +++ b/mozilla/widget/src/cocoa/Makefile.in @@ -49,6 +49,7 @@ IS_COMPONENT = 1 MODULE_NAME = nsWidgetMacModule XPIDL_MODULE = widget_cocoa GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ gfx \ diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in index b3431be984c..506a98bb886 100644 --- a/mozilla/widget/src/gtk/Makefile.in +++ b/mozilla/widget/src/gtk/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetGTKModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = widget_gtk.pkg diff --git a/mozilla/widget/src/gtk2/Makefile.in b/mozilla/widget/src/gtk2/Makefile.in index 78b088d197a..226a2e86ae9 100644 --- a/mozilla/widget/src/gtk2/Makefile.in +++ b/mozilla/widget/src/gtk2/Makefile.in @@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetGtk2Module GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = widget_gtk2.pkg diff --git a/mozilla/widget/src/gtksuperwin/Makefile.in b/mozilla/widget/src/gtksuperwin/Makefile.in index 326573ca3d4..03aad9efdd4 100644 --- a/mozilla/widget/src/gtksuperwin/Makefile.in +++ b/mozilla/widget/src/gtksuperwin/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = gtksuperwin EXPORT_LIBRARY = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = gtksuperwin.pkg diff --git a/mozilla/widget/src/gtkxtbin/Makefile.in b/mozilla/widget/src/gtkxtbin/Makefile.in index 2d6dd2a58ce..b8d385de649 100644 --- a/mozilla/widget/src/gtkxtbin/Makefile.in +++ b/mozilla/widget/src/gtkxtbin/Makefile.in @@ -47,6 +47,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = gtkxtbin LIBRARY_NAME = gtkxtbin EXPORT_LIBRARY = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = gtkxtbin.pkg diff --git a/mozilla/widget/src/mac/Makefile.in b/mozilla/widget/src/mac/Makefile.in index b1fa75c2700..044919237f4 100644 --- a/mozilla/widget/src/mac/Makefile.in +++ b/mozilla/widget/src/mac/Makefile.in @@ -49,6 +49,7 @@ IS_COMPONENT = 1 MODULE_NAME = nsWidgetMacModule XPIDL_MODULE = widget_mac GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ gfx \ diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in index 70ff0a79eb0..9db338fcd5e 100644 --- a/mozilla/widget/src/os2/Makefile.in +++ b/mozilla/widget/src/os2/Makefile.in @@ -49,6 +49,7 @@ IS_COMPONENT = 1 RESFILE = widget.res MODULE_NAME = nsWidgetOS2Module GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = widget_os2.pkg diff --git a/mozilla/widget/src/photon/Makefile.in b/mozilla/widget/src/photon/Makefile.in index 80a495e40c1..d8d7eff53fe 100644 --- a/mozilla/widget/src/photon/Makefile.in +++ b/mozilla/widget/src/photon/Makefile.in @@ -47,6 +47,8 @@ LIBRARY_NAME = widget_photon EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetPhModule +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ appshell \ diff --git a/mozilla/widget/src/support/Makefile.in b/mozilla/widget/src/support/Makefile.in index cc127aadb97..2bb0ca53f08 100644 --- a/mozilla/widget/src/support/Makefile.in +++ b/mozilla/widget/src/support/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widgetsupport_s +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ gfx \ diff --git a/mozilla/widget/src/windows/Makefile.in b/mozilla/widget/src/windows/Makefile.in index 80fdcc74b9e..f07f3374a1b 100644 --- a/mozilla/widget/src/windows/Makefile.in +++ b/mozilla/widget/src/windows/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_windows +LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ diff --git a/mozilla/widget/src/windows/nsToolkit.cpp b/mozilla/widget/src/windows/nsToolkit.cpp index 27167b011ae..81f4af3380b 100644 --- a/mozilla/widget/src/windows/nsToolkit.cpp +++ b/mozilla/widget/src/windows/nsToolkit.cpp @@ -97,7 +97,7 @@ MouseTrailer *MouseTrailer::theMouseTrailer = NULL; PRBool MouseTrailer::gIgnoreNextCycle(PR_FALSE); PRBool MouseTrailer::mIsInCaptureMode(PR_FALSE); -#ifndef MOZ_STATIC_COMPONENT_LIBS +#if !defined(MOZ_STATIC_COMPONENT_LIBS) && !defined(MOZ_ENABLE_LIBXUL) // // Dll entry point. Keep the dll instance // diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in index cf2f40a581d..ac42dbd8109 100644 --- a/mozilla/widget/src/xlib/Makefile.in +++ b/mozilla/widget/src/xlib/Makefile.in @@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetXLIBModule GRE_MODULE = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = widget_xlib.pkg diff --git a/mozilla/widget/src/xlibxtbin/Makefile.in b/mozilla/widget/src/xlibxtbin/Makefile.in index c7900b32ea9..25cc6baec40 100644 --- a/mozilla/widget/src/xlibxtbin/Makefile.in +++ b/mozilla/widget/src/xlibxtbin/Makefile.in @@ -47,6 +47,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xlibxtbin LIBRARY_NAME = xlibxtbin EXPORT_LIBRARY = 1 +LIBXUL_LIBRARY = 1 PACKAGE_FILE = xlibxtbin.pkg diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index d9fe6250b33..9471c9aa18e 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = xpwidgets_s +LIBXUL_LIBRARY = 1 + REQUIRES = xpcom \ string \ gfx \ diff --git a/mozilla/widget/src/xremoteclient/Makefile.in b/mozilla/widget/src/xremoteclient/Makefile.in index b44cb175409..18da45d29bb 100644 --- a/mozilla/widget/src/xremoteclient/Makefile.in +++ b/mozilla/widget/src/xremoteclient/Makefile.in @@ -47,6 +47,7 @@ LIBRARY_NAME = xremote_client EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = XRemoteClientModule +LIBXUL_LIBRARY = 1 PACKAGE_FILE = xremoteclient.pkg diff --git a/mozilla/xpcom/Makefile.in b/mozilla/xpcom/Makefile.in index a94cc1ace57..934debf9e0c 100644 --- a/mozilla/xpcom/Makefile.in +++ b/mozilla/xpcom/Makefile.in @@ -61,11 +61,12 @@ DIRS = \ $(NULL) ifndef MOZ_ENABLE_LIBXUL -DIRS += \ - stub \ +DIRS += stub +endif + +TOOL_DIRS = \ tools \ $(NULL) -endif ifeq ($(OS_ARCH),WINNT) ifdef MOZ_DEBUG @@ -74,8 +75,7 @@ endif endif ifdef ENABLE_TESTS -ifndef MOZ_ENABLE_LIBXUL -DIRS += \ +TOOL_DIRS += \ tests \ sample \ typelib/xpt/tests \ @@ -83,7 +83,6 @@ DIRS += \ reflect/xptcall/tests \ proxy/tests endif -endif # xpcom-config.h is generated by configure SDK_HEADERS = xpcom-config.h diff --git a/mozilla/xpcom/threads/plevent.c b/mozilla/xpcom/threads/plevent.c index 658602dbe41..f6e245c39ff 100644 --- a/mozilla/xpcom/threads/plevent.c +++ b/mozilla/xpcom/threads/plevent.c @@ -1383,11 +1383,11 @@ PL_IsQueueNative(PLEventQueue *queue) ** In Win32 this is the module handle of the DLL. ** */ -static HINSTANCE _pr_hInstance; +HINSTANCE _pr_hInstance; #endif -#if defined(_WIN32) +#if defined(_WIN32) && !defined(MOZ_ENABLE_LIBXUL) /* ** Initialization routine for the DLL...