From 5659a611dda7eab3f9b9a158e205649e71fac57a Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 23 Jul 2014 13:30:52 +0900 Subject: [PATCH] Bug 1036894 part 8 - Move most in-tree library linkage information to moz.build, as USE_LIBS. r=gps --- b2g/app/Makefile.in | 8 -- b2g/app/moz.build | 18 ++++ browser/app/Makefile.in | 4 - browser/app/moz.build | 4 + browser/components/build/Makefile.in | 3 +- browser/components/build/moz.build | 6 ++ config/config.mk | 4 - config/rules.mk | 2 +- configure.in | 87 ++++--------------- content/base/test/moz.build | 5 ++ content/canvas/compiledtest/moz.build | 5 ++ content/media/compiledtest/moz.build | 5 ++ content/media/webaudio/compiledtest/moz.build | 5 ++ dom/audiochannel/tests/moz.build | 5 ++ editor/txmgr/tests/moz.build | 5 ++ embedding/tests/winEmbed/Makefile.in | 5 -- embedding/tests/winEmbed/moz.build | 5 ++ extensions/gnomevfs/Makefile.in | 3 +- extensions/gnomevfs/moz.build | 6 ++ gfx/angle/src/libEGL/moz.build | 2 +- intl/lwbrk/tests/moz.build | 5 ++ intl/unicharutil/tests/Makefile.in | 5 +- intl/unicharutil/tests/moz.build | 15 ++++ ipc/app/Makefile.in | 2 - ipc/app/moz.build | 8 ++ ipc/ipdl/test/cxx/app/Makefile.in | 4 +- ipc/ipdl/test/cxx/app/moz.build | 6 ++ js/src/Makefile.in | 9 +- js/src/configure.in | 18 ++-- js/src/gdb/Makefile.in | 2 +- js/src/gdb/moz.build | 4 + js/src/jsapi-tests/Makefile.in | 2 +- js/src/jsapi-tests/moz.build | 4 + js/src/moz.build | 15 +++- js/src/shell/Makefile.in | 2 +- js/src/shell/moz.build | 3 + js/xpconnect/shell/Makefile.in | 10 --- js/xpconnect/shell/moz.build | 6 ++ js/xpconnect/tests/Makefile.in | 5 +- .../tests/components/native/Makefile.in | 3 +- .../tests/components/native/moz.build | 6 ++ js/xpconnect/tests/moz.build | 5 ++ layout/media/Makefile.in | 2 +- layout/media/moz.build | 3 + media/libcubeb/tests/Makefile.in | 28 ++---- media/libcubeb/tests/moz.build | 24 +++++ media/mtransport/test/Makefile.in | 11 +-- media/mtransport/test/moz.build | 14 +++ media/omx-plugin/Makefile.in | 9 -- media/omx-plugin/froyo/Makefile.in | 25 ------ media/omx-plugin/froyo/moz.build | 6 ++ media/omx-plugin/gb/Makefile.in | 25 ------ media/omx-plugin/gb/moz.build | 6 ++ media/omx-plugin/gb235/Makefile.in | 25 ------ media/omx-plugin/gb235/moz.build | 6 ++ media/omx-plugin/hc/Makefile.in | 23 ----- media/omx-plugin/hc/moz.build | 5 ++ media/omx-plugin/kk/Makefile.in | 25 ------ media/omx-plugin/kk/moz.build | 6 ++ .../lib/froyo/libstagefright/Makefile.in | 20 ----- .../lib/froyo/libstagefright/moz.build | 4 + .../lib/gb/libstagefright/Makefile.in | 20 ----- .../lib/gb/libstagefright/moz.build | 4 + .../lib/gb235/libstagefright/Makefile.in | 20 ----- .../lib/gb235/libstagefright/moz.build | 4 + .../lib/hc/libstagefright/Makefile.in | 20 ----- .../lib/hc/libstagefright/moz.build | 4 + .../lib/ics/libstagefright/Makefile.in | 20 ----- .../lib/ics/libstagefright/moz.build | 4 + media/omx-plugin/moz.build | 6 ++ media/webrtc/signaling/test/Makefile.in | 28 +----- media/webrtc/signaling/test/moz.build | 29 +++++++ memory/build/Makefile.in | 8 -- memory/build/moz.build | 10 +++ memory/mozalloc/tests/moz.build | 6 ++ memory/mozjemalloc/moz.build | 3 +- memory/replace/jemalloc/Makefile.in | 2 - memory/replace/jemalloc/moz.build | 4 + mfbt/tests/Makefile.in | 5 +- mfbt/tests/moz.build | 4 + modules/libmar/tool/Makefile.in | 4 - modules/libmar/tool/moz.build | 10 +++ mozglue/build/Makefile.in | 4 - mozglue/build/moz.build | 9 ++ mozglue/tests/Makefile.in | 2 - mozglue/tests/moz.build | 3 + netwerk/streamconv/test/Makefile.in | 4 +- netwerk/streamconv/test/moz.build | 6 ++ netwerk/test/Makefile.in | 2 +- netwerk/test/moz.build | 6 ++ rdf/tests/rdfcat/Makefile.in | 4 +- rdf/tests/rdfcat/moz.build | 6 ++ rdf/tests/rdfpoll/Makefile.in | 4 +- rdf/tests/rdfpoll/moz.build | 6 ++ rdf/tests/triplescat/Makefile.in | 4 +- rdf/tests/triplescat/moz.build | 6 ++ security/build/Makefile.in | 7 +- security/build/moz.build | 4 + security/manager/ssl/tests/compiled/moz.build | 6 ++ .../ssl/tests/unit/tlsserver/cmd/Makefile.in | 6 +- .../ssl/tests/unit/tlsserver/cmd/moz.build | 6 ++ .../sandbox/win/src/sandboxbroker/Makefile.in | 1 - .../sandbox/win/src/sandboxbroker/moz.build | 4 + startupcache/test/Makefile.in | 2 +- startupcache/test/moz.build | 6 ++ storage/test/Makefile.in | 4 +- storage/test/moz.build | 11 +++ testing/mochitest/ssltunnel/Makefile.in | 1 - testing/mochitest/ssltunnel/moz.build | 4 + toolkit/components/ctypes/tests/Makefile.in | 2 - toolkit/components/ctypes/tests/moz.build | 3 + .../components/maintenanceservice/Makefile.in | 6 -- .../components/maintenanceservice/moz.build | 9 ++ .../components/places/tests/cpp/Makefile.in | 7 -- toolkit/components/places/tests/cpp/moz.build | 10 +++ toolkit/crashreporter/client/Makefile.in | 17 ---- toolkit/crashreporter/client/moz.build | 13 +++ toolkit/crashreporter/test/Makefile.in | 2 +- toolkit/crashreporter/test/moz.build | 6 ++ toolkit/library/Makefile.in | 4 - toolkit/library/libxul.mk | 29 +++---- toolkit/library/libxul.mozbuild | 48 ++++++++++ toolkit/mozapps/update/tests/Makefile.in | 3 - toolkit/mozapps/update/tests/moz.build | 9 ++ toolkit/mozapps/update/updater/Makefile.in | 10 +-- toolkit/mozapps/update/updater/moz.build | 17 ++++ toolkit/system/dbus/Makefile.in | 3 +- toolkit/system/dbus/moz.build | 6 ++ toolkit/system/gnome/Makefile.in | 2 - toolkit/system/gnome/moz.build | 5 ++ tools/trace-malloc/Makefile.in | 5 -- tools/trace-malloc/moz.build | 6 ++ webapprt/gtk/Makefile.in | 3 +- webapprt/gtk/moz.build | 4 + webapprt/mac/Makefile.in | 4 - webapprt/mac/moz.build | 4 + webapprt/win/Makefile.in | 4 - webapprt/win/moz.build | 4 + widget/tests/moz.build | 6 ++ widget/xremoteclient/Makefile.in | 5 -- xpcom/reflect/xptcall/tests/Makefile.in | 3 +- xpcom/reflect/xptcall/tests/moz.build | 6 ++ xpcom/reflect/xptinfo/tests/Makefile.in | 3 +- xpcom/reflect/xptinfo/tests/moz.build | 6 ++ xpcom/sample/Makefile.in | 4 +- xpcom/sample/moz.build | 6 ++ xpcom/sample/program/Makefile.in | 8 -- xpcom/sample/program/moz.build | 8 ++ xpcom/tests/Makefile.in | 2 - xpcom/tests/bug656331_component/Makefile.in | 4 +- xpcom/tests/bug656331_component/moz.build | 6 ++ xpcom/tests/component/Makefile.in | 4 +- xpcom/tests/component/moz.build | 6 ++ xpcom/tests/component_no_aslr/Makefile.in | 2 - xpcom/tests/component_no_aslr/moz.build | 6 ++ xpcom/tests/external/Makefile.in | 1 - xpcom/tests/external/moz.build | 6 ++ xpcom/tests/moz.build | 6 ++ xpcom/tests/windows/moz.build | 6 ++ xpcom/typelib/xpt/tests/Makefile.in | 5 -- xpcom/typelib/xpt/tests/moz.build | 6 ++ xulrunner/app/Makefile.in | 4 - xulrunner/app/moz.build | 4 + .../simple/components/src/Makefile.in | 3 +- .../examples/simple/components/src/moz.build | 6 ++ xulrunner/stub/Makefile.in | 4 - xulrunner/stub/moz.build | 9 ++ xulrunner/tools/redit/Makefile.in | 4 - xulrunner/tools/redit/moz.build | 4 + 169 files changed, 710 insertions(+), 624 deletions(-) delete mode 100644 media/omx-plugin/froyo/Makefile.in delete mode 100644 media/omx-plugin/gb/Makefile.in delete mode 100644 media/omx-plugin/gb235/Makefile.in delete mode 100644 media/omx-plugin/hc/Makefile.in delete mode 100644 media/omx-plugin/kk/Makefile.in delete mode 100644 media/omx-plugin/lib/froyo/libstagefright/Makefile.in delete mode 100644 media/omx-plugin/lib/gb/libstagefright/Makefile.in delete mode 100644 media/omx-plugin/lib/gb235/libstagefright/Makefile.in delete mode 100644 media/omx-plugin/lib/hc/libstagefright/Makefile.in delete mode 100644 media/omx-plugin/lib/ics/libstagefright/Makefile.in delete mode 100644 toolkit/components/places/tests/cpp/Makefile.in diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in index 89045dd46bd..00c0e566dc5 100644 --- a/b2g/app/Makefile.in +++ b/b2g/app/Makefile.in @@ -16,8 +16,6 @@ LIBS += \ -lhardware_legacy \ -lhardware \ -lcutils \ - $(DEPTH)/media/libpng/$(LIB_PREFIX)mozpng.$(LIB_SUFFIX) \ - $(DEPTH)/widget/gonk/libdisplay/$(LIB_PREFIX)display.$(LIB_SUFFIX) \ $(MOZ_ZLIB_LIBS) \ $(NULL) ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),17 18 19)) @@ -28,12 +26,6 @@ LIBS += \ endif endif -LIBS += $(JEMALLOC_LIBS) - -LIBS += \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ -lbinder \ diff --git a/b2g/app/moz.build b/b2g/app/moz.build index 90a30cf8233..77879ddb444 100644 --- a/b2g/app/moz.build +++ b/b2g/app/moz.build @@ -17,6 +17,11 @@ if not CONFIG['LIBXUL_SDK']: # a console application. WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup'] + if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZCONFIG']: + USE_LIBS += [ + 'mozz', + ] + DEFINES['XPCOM_GLUE'] = True for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'): @@ -39,4 +44,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': LDFLAGS += ['-Wl,--export-dynamic'] + USE_LIBS += [ + 'display', + 'mozpng', + ] + if not CONFIG['MOZ_NATIVE_ZLIB']: + USE_LIBS += [ + 'mozz', + ] + +USE_LIBS += [ + 'xpcomglue', +] + DISABLE_STL_WRAPPING = True diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 4fb9b57d69e..66328c6ebc8 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -25,10 +25,6 @@ endif #} LIBXUL_SDK # Build a binary bootstrapping with XRE_main -LIBS += \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - ifdef MOZ_LINKER LIBS += $(MOZ_ZLIB_LIBS) endif diff --git a/browser/app/moz.build b/browser/app/moz.build index 713c393ac69..a723c4e4508 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -50,4 +50,8 @@ if CONFIG['OS_ARCH'] == 'WINNT': if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: LDFLAGS += ['/HEAP:0x40000'] +USE_LIBS += [ + 'xpcomglue', +] + DISABLE_STL_WRAPPING = True diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index 47286bbbf84..2eaad7c1262 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -11,8 +11,7 @@ OS_LIBS += $(call EXPAND_LIBNAME,version) endif EXTRA_DSO_LDOPTS += \ - $(XPCOM_GLUE_LDOPTS) \ - $(MOZ_COMPONENT_LIBS) \ + $(NSPR_LIBS) \ $(NULL) # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build index a7d9e1e5ea6..e7b446f8db8 100644 --- a/browser/components/build/moz.build +++ b/browser/components/build/moz.build @@ -23,3 +23,9 @@ LOCAL_INCLUDES += [ '../migration/src', '../shell/src', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/config/config.mk b/config/config.mk index 9824c8d68c3..9031fc0af2d 100644 --- a/config/config.mk +++ b/config/config.mk @@ -264,8 +264,6 @@ ifneq (,$(MOZ_DEBUG)$(MOZ_DEBUG_SYMBOLS)) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) endif -MOZALLOC_LIB = $(call EXPAND_LIBNAME_PATH,mozalloc,$(DIST)/lib) - ASFLAGS += $(_DEBUG_ASFLAGS) OS_CFLAGS += $(_DEBUG_CFLAGS) OS_CXXFLAGS += $(_DEBUG_CFLAGS) @@ -586,8 +584,6 @@ SDK_BIN_DIR = $(DIST)/sdk/bin DEPENDENCIES = .md -MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS) - ifdef MACOSX_DEPLOYMENT_TARGET export MACOSX_DEPLOYMENT_TARGET endif # MACOSX_DEPLOYMENT_TARGET diff --git a/config/rules.mk b/config/rules.mk index 9927e743a89..75827856cc4 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -83,7 +83,7 @@ ifdef COMPILE_ENVIRONMENT # which stuff links. SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS) INCLUDES += -I$(DIST)/include/testing -LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS) +LIBS += $(NSPR_LIBS) ifndef MOZ_PROFILE_GENERATE libs:: $(CPP_UNIT_TESTS) $(call mkdir_deps,$(DIST)/cppunittests) diff --git a/configure.in b/configure.in index a7603a7682e..dcc60a70d99 100644 --- a/configure.in +++ b/configure.in @@ -959,37 +959,10 @@ TARGET_MD_ARCH=unix DIRENT_INO=d_ino MOZ_USER_DIR=".mozilla" -MOZ_JPEG_CFLAGS= -MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/media/libjpeg)' -MOZ_BZ2_CFLAGS= -MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' -MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation -MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' - -MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' -MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' -XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' -LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)' -XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' -XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)' - -# These are specially defined on Windows only -case "$target" in -*-mingw*) - XPCOM_STATICRUNTIME_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_staticruntime_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' - XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_staticruntime.$(LIB_SUFFIX)' - ;; -*) - XPCOM_STATICRUNTIME_GLUE_LDOPTS=$XPCOM_GLUE_LDOPTS - XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS=$XPCOM_STANDALONE_GLUE_LDOPTS - ;; -esac MOZ_FS_LAYOUT=unix -MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' - USE_DEPENDENT_LIBS=1 _PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2 @@ -2061,7 +2034,6 @@ ia64*-hpux*) MC=mc.exe # certain versions of cygwin's makedepend barf on the # #include vs -I./dist/include/string issue so don't use it - XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/lib)' if test -n "$GNU_CC" -o -n "$CLANG_CC"; then CC="$CC -mwindows" CXX="$CXX -mwindows" @@ -3023,16 +2995,18 @@ fi AC_LANG_CPLUSPLUS +ICONV_LIBS= + case $target_os in darwin*|mingw*) ;; *) -AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"], - AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"], - AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"]))) +AC_CHECK_LIB(c, iconv, [ICONV_LIBS=], + AC_CHECK_LIB(iconv, iconv, [ICONV_LIBS="-liconv"], + AC_CHECK_LIB(iconv, libiconv, [ICONV_LIBS="-liconv"]))) _SAVE_LIBS=$LIBS -LIBS="$LIBS $_ICONV_LIBS" +LIBS="$LIBS $ICONV_LIBS" AC_CACHE_CHECK( [for iconv()], ac_cv_func_iconv, @@ -3051,8 +3025,7 @@ AC_CACHE_CHECK( ) if test "$ac_cv_func_iconv" = "yes"; then AC_DEFINE(HAVE_ICONV) - LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" - LIBICONV="$_ICONV_LIBS" + LIBICONV="$ICONV_LIBS" AC_CACHE_CHECK( [for iconv() with const input], ac_cv_func_const_iconv, @@ -3079,6 +3052,8 @@ LIBS=$_SAVE_LIBS ;; esac +AC_SUBST(ICONV_LIBS) + AM_LANGINFO_CODESET AC_LANG_C @@ -3625,11 +3600,6 @@ dnl system ZLIB support dnl ======================================================== MOZ_ZLIB_CHECK([1.2.3]) -if test "$MOZ_NATIVE_ZLIB" != 1; then - MOZ_ZLIB_CFLAGS="-I${_topsrcdir}/modules/zlib/src" - MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,'"$MOZ_BUILD_ROOT"'/modules/zlib/src)' -fi - if test "$MOZ_LINKER" = 1 -a "$MOZ_NATIVE_ZLIB" != 1; then AC_MSG_ERROR([Custom dynamic linker requires --with-system-zlib]) fi @@ -3760,10 +3730,6 @@ dnl system libffi Support dnl ======================================================== MOZ_CONFIG_FFI() -if test -n "$MOZ_NATIVE_FFI"; then - MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS" -fi - # split JS out by default to avoid VS2005 PGO crash (bug 591836). if test "$OS_ARCH" = "WINNT"; then JS_SHARED_LIBRARY=1 @@ -4247,7 +4213,6 @@ cairo-cocoa) TK_CFLAGS="-DNO_X11" CFLAGS="$CFLAGS $TK_CFLAGS" CXXFLAGS="$CXXFLAGS $TK_CFLAGS" - XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/bin/XUL $(call EXPAND_LIBNAME_PATH,mozalloc,$(LIBXUL_DIST)/bin)' MOZ_USER_DIR="Mozilla" MOZ_FS_LAYOUT=bundle MOZ_WEBGL=1 @@ -4262,7 +4227,6 @@ cairo-uikit) TK_LIBS='-framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreText' CFLAGS="$CFLAGS $TK_CFLAGS" CXXFLAGS="$CXXFLAGS $TK_CFLAGS" - XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/bin/XUL $(call EXPAND_LIBNAME_PATH,mozalloc,$(LIBXUL_DIST)/bin)' MOZ_USER_DIR="Mozilla" MOZ_FS_LAYOUT=bundle ;; @@ -4278,7 +4242,6 @@ cairo-android) ;; cairo-gonk) - XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/lib)' AC_DEFINE(MOZ_WIDGET_GONK) AC_DEFINE(MOZ_TOUCH) MOZ_WIDGET_TOOLKIT=gonk @@ -6475,11 +6438,8 @@ MOZ_ARG_ENABLE_BOOL(system-sqlite, MOZ_NATIVE_SQLITE=1, MOZ_NATIVE_SQLITE= ) -if test -z "$MOZ_NATIVE_SQLITE" +if test -n "$MOZ_NATIVE_SQLITE" then - SQLITE_CFLAGS= - SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)' -else dnl ============================ dnl === SQLite Version check === dnl ============================ @@ -7844,9 +7804,6 @@ dnl = dnl ======================================================== MOZ_ARG_HEADER(Static build options) -AC_SUBST(LIBXUL_LIBS) -XPCOM_LIBS="$LIBXUL_LIBS" - if test "$OS_ARCH" = "WINNT"; then GKMEDIAS_SHARED_LIBRARY=1 AC_DEFINE(GKMEDIAS_SHARED_LIBRARY) @@ -8019,8 +7976,6 @@ fi if test "$MOZ_TREE_PIXMAN"; then AC_DEFINE(MOZ_TREE_PIXMAN) - MOZ_PIXMAN_CFLAGS="" - MOZ_PIXMAN_LIBS='$(call EXPAND_LIBNAME_PATH,mozlibpixman,$(DEPTH)/gfx/cairo/libpixman/src)' else PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.19.2) MOZ_PIXMAN_CFLAGS="$PIXMAN_CFLAGS" @@ -8397,7 +8352,6 @@ AC_SUBST(MOZ_UPDATE_XTERM) AC_SUBST(MOZ_AUTH_EXTENSION) AC_SUBST(MOZ_PERMISSIONS) AC_SUBST(MOZ_PREF_EXTENSIONS) -AC_SUBST(MOZ_JS_LIBS) AC_SUBST(MOZ_DEBUG) AC_SUBST(MOZ_DEBUG_SYMBOLS) AC_SUBST(MOZ_DEBUG_ENABLE_DEFS) @@ -8473,12 +8427,6 @@ AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS) AC_SUBST(MOZ_COMPONENT_NSPR_LIBS) AC_SUBST(MOZ_FIX_LINK_PATHS) -AC_SUBST(XPCOM_LIBS) -AC_SUBST(XPCOM_FROZEN_LDOPTS) -AC_SUBST(XPCOM_GLUE_LDOPTS) -AC_SUBST(XPCOM_STANDALONE_GLUE_LDOPTS) -AC_SUBST(XPCOM_STATICRUNTIME_GLUE_LDOPTS) -AC_SUBST(XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS) AC_SUBST(USE_DEPENDENT_LIBS) @@ -8934,14 +8882,7 @@ fi MOZ_CONFIG_ICU() -if test -n "$MOZ_NATIVE_ICU"; then - MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" -fi - -if test -n "$JS_SHARED_LIBRARY"; then - MOZ_JS_LIBS="$MOZ_JS_SHARED_LIBS" -else - MOZ_JS_LIBS="$MOZ_JS_STATIC_LIBS" +if test -z "$JS_SHARED_LIBRARY"; then AC_DEFINE(MOZ_STATIC_JS) fi AC_SUBST(JS_SHARED_LIBRARY) @@ -9055,7 +8996,11 @@ if test "$MOZ_TREE_FREETYPE"; then export LDFLAGS="$LDFLAGS $MOZ_DEBUG_LDFLAGS" # Spaces in the *_CFLAGS and *_LIBS variables are intentionally placed # to force freetype to use our settings rather than autodetecting - export LIBPNG_CFLAGS="$MOZ_PNG_CFLAGS " + if test -n "$MOZ_NATIVE_PNG"; then + export LIBPNG_CFLAGS="$MOZ_PNG_CFLAGS " + else + export LIBPNG_CFLAGS="-I$_objdir/dist/include" + fi export LIBPNG_LIBS="$MOZ_PNG_LIBS " export ZLIB_CFLAGS="$MOZ_ZLIB_CFLAGS " export ZLIB_LIBS="$MOZ_ZLIB_LIBS " diff --git a/content/base/test/moz.build b/content/base/test/moz.build index 002160302d5..7c72ffa5009 100644 --- a/content/base/test/moz.build +++ b/content/base/test/moz.build @@ -43,3 +43,8 @@ MOCHITEST_CHROME_MANIFESTS += [ BROWSER_CHROME_MANIFESTS += ['browser.ini'] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/content/canvas/compiledtest/moz.build b/content/canvas/compiledtest/moz.build index 6c3e3e22059..6e1bb3021ff 100644 --- a/content/canvas/compiledtest/moz.build +++ b/content/canvas/compiledtest/moz.build @@ -16,3 +16,8 @@ LOCAL_INCLUDES += [ '../src', ] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/content/media/compiledtest/moz.build b/content/media/compiledtest/moz.build index a7ad6efead2..56d627cd957 100644 --- a/content/media/compiledtest/moz.build +++ b/content/media/compiledtest/moz.build @@ -16,3 +16,8 @@ LOCAL_INCLUDES += [ '..', ] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/content/media/webaudio/compiledtest/moz.build b/content/media/webaudio/compiledtest/moz.build index ba7b48d81bd..ee9cb9325b0 100644 --- a/content/media/webaudio/compiledtest/moz.build +++ b/content/media/webaudio/compiledtest/moz.build @@ -16,3 +16,8 @@ LOCAL_INCLUDES += [ '..', ] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/dom/audiochannel/tests/moz.build b/dom/audiochannel/tests/moz.build index 2400c73071c..1b964da0713 100644 --- a/dom/audiochannel/tests/moz.build +++ b/dom/audiochannel/tests/moz.build @@ -17,3 +17,8 @@ MOCHITEST_MANIFESTS += ['mochitest.ini'] FAIL_ON_WARNINGS = True +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/editor/txmgr/tests/moz.build b/editor/txmgr/tests/moz.build index 076733539cf..b31055c33af 100644 --- a/editor/txmgr/tests/moz.build +++ b/editor/txmgr/tests/moz.build @@ -12,3 +12,8 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS) FAIL_ON_WARNINGS = True +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in index 25534b1ac87..7d60f8d6ff9 100644 --- a/embedding/tests/winEmbed/Makefile.in +++ b/embedding/tests/winEmbed/Makefile.in @@ -27,11 +27,6 @@ # # ***** END LICENSE BLOCK ***** -LIBS = \ - $(DEPTH)/profile/dirserviceprovider/src/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - OS_LIBS += $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version) include $(topsrcdir)/config/rules.mk diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build index 350d9e430c3..14f9c96b1d4 100644 --- a/embedding/tests/winEmbed/moz.build +++ b/embedding/tests/winEmbed/moz.build @@ -33,3 +33,8 @@ else: LDFLAGS += ['/HEAP:0x40000'] DISABLE_STL_WRAPPING = True + +USE_LIBS += [ + 'profdirserviceprovidersa_s', + 'xpcomglue', +] diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in index 0578427efd4..7cec18003ae 100644 --- a/extensions/gnomevfs/Makefile.in +++ b/extensions/gnomevfs/Makefile.in @@ -5,8 +5,7 @@ LOCAL_INCLUDES = $(MOZ_GNOMEVFS_CFLAGS) -EXTRA_DSO_LDOPTS = \ - $(XPCOM_GLUE_LDOPTS) \ +EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(MOZ_GNOMEVFS_LIBS) \ $(NULL) diff --git a/extensions/gnomevfs/moz.build b/extensions/gnomevfs/moz.build index 9ef29dd07fa..fe539cf8623 100644 --- a/extensions/gnomevfs/moz.build +++ b/extensions/gnomevfs/moz.build @@ -16,3 +16,9 @@ IS_COMPONENT = True # application. this is necessary since we don't want to force users # to install gnome-vfs2 in order to use the rest of mozilla ;-) FORCE_SHARED_LIB = True + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build index 53cad4e839e..4dc7ba8ee2a 100644 --- a/gfx/angle/src/libEGL/moz.build +++ b/gfx/angle/src/libEGL/moz.build @@ -52,7 +52,7 @@ DISABLE_STL_WRAPPING = True LOCAL_INCLUDES += [ '../../include', '../../src' ] -EXTRA_DSO_LDOPTS += [ '../libGLESv2/libGLESv2.lib' ] +USE_LIBS += [ 'libGLESv2' ] LIBRARY_NAME = 'libEGL' FORCE_SHARED_LIB = True diff --git a/intl/lwbrk/tests/moz.build b/intl/lwbrk/tests/moz.build index 53211d13fc5..a2e3f5bffd9 100644 --- a/intl/lwbrk/tests/moz.build +++ b/intl/lwbrk/tests/moz.build @@ -14,3 +14,8 @@ LOCAL_INCLUDES += [ '../public', ] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in index e678a5f19ad..f69a075b46b 100644 --- a/intl/unicharutil/tests/Makefile.in +++ b/intl/unicharutil/tests/Makefile.in @@ -3,9 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \ - $(DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/intl/unicharutil/tests/moz.build b/intl/unicharutil/tests/moz.build index 0744556190c..af3ce070276 100644 --- a/intl/unicharutil/tests/moz.build +++ b/intl/unicharutil/tests/moz.build @@ -20,3 +20,18 @@ LOCAL_INCLUDES += [ ] USE_STATIC_LIBS = True + +USE_LIBS += [ + 'mozalloc', + 'unicharutil_external_s', + 'xul-shared', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + USE_LIBS += [ + 'xpcomglue_staticruntime_s', + ] +else: + USE_LIBS += [ + 'xpcomglue_s', + ] diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in index 6627f2c9856..aa8ee1c3f80 100644 --- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -10,7 +10,6 @@ ifeq (android,$(MOZ_WIDGET_TOOLKIT)) WRAP_LDFLAGS = else LIBS += \ - $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) endif @@ -40,7 +39,6 @@ include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) #{ -LIBS += ../../security/sandbox/$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX) LIBS += $(NSPR_LIBS) # Note the manifest file exists in the tree, so we use the explicit filename diff --git a/ipc/app/moz.build b/ipc/app/moz.build index a06e8ddbaf8..3f2bc7187ea 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -15,6 +15,11 @@ else: SOURCES += [ 'MozillaRuntimeMain.cpp', ] + USE_LIBS += [ + 'mozalloc', + 'xul-shared', + ] + include('/ipc/chromium/chromium-config.mozbuild') LOCAL_INCLUDES += [ @@ -29,6 +34,9 @@ if CONFIG['OS_ARCH'] == 'WINNT': '/security/sandbox', '/security/sandbox/chromium', ] + USE_LIBS += [ + 'sandbox_s', + ] if CONFIG['_MSC_VER']: # Always enter a Windows program through wmain, whether or not we're diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in index 5b3c4d1c7e2..02eabe5457d 100644 --- a/ipc/ipdl/test/cxx/app/Makefile.in +++ b/ipc/ipdl/test/cxx/app/Makefile.in @@ -4,9 +4,7 @@ NSDISTMODE = copy -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(LIBXUL_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/ipc/ipdl/test/cxx/app/moz.build b/ipc/ipdl/test/cxx/app/moz.build index 08d00a9943d..b72c7342ab2 100644 --- a/ipc/ipdl/test/cxx/app/moz.build +++ b/ipc/ipdl/test/cxx/app/moz.build @@ -18,3 +18,9 @@ LOCAL_INCLUDES += [ if CONFIG['_MSC_VER']: WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup'] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 730d63f58c8..ef131430921 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -15,17 +15,10 @@ endif TOPLEVEL_BUILD := 1 run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') -LIBS = $(NSPR_LIBS) +LIBS += $(NSPR_LIBS) DIST_INSTALL = 1 -ifdef JS_STANDALONE -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) -ifndef MOZ_NATIVE_ZLIB -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src) -endif -endif - ifdef JS_HAS_CTYPES ifdef MOZ_NATIVE_FFI LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) diff --git a/js/src/configure.in b/js/src/configure.in index 9d689c62795..8e4667e4998 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -767,8 +767,6 @@ MOZ_USER_DIR=".mozilla" MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' -MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' - USE_DEPENDENT_LIBS=1 _PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2 @@ -1679,7 +1677,6 @@ ia64*-hpux*) WARNINGS_AS_ERRORS='-WX' MOZ_OPTIMIZE_FLAGS="-O2" MOZ_FIX_LINK_PATHS= - MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' # Disable these flags on clang-cl since it doesn't ignore unknown arguments by default, and # autoconf insists on passing $LDFLAGS to the compiler. if test -z "$CLANG_CL"; then @@ -1953,7 +1950,7 @@ case "$target" in ;; *-solaris*) if test -z "$GNU_CC"; then - MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile' + eOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile' else if test -z "$GCC_USE_GNU_LD"; then MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-M -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile' @@ -2772,13 +2769,16 @@ dnl ======================================================== dnl system zlib Support dnl ======================================================== dnl Standalone js defaults to system zlib -ZLIB_DIR=yes +if test -n "$JS_STANDALONE"; then + ZLIB_DIR=yes +fi MOZ_ZLIB_CHECK([1.2.3]) if test -n "$ZLIB_IN_MOZGLUE"; then AC_DEFINE(ZLIB_IN_MOZGLUE) fi +AC_SUBST(ZLIB_IN_MOZGLUE) dnl ======================================================== dnl system libffi Support @@ -3615,7 +3615,7 @@ MOZ_ARG_ENABLE_BOOL(readline, JS_WANT_READLINE=1, JS_WANT_READLINE= ) -JS_NATIVE_EDITLINE= +JS_BUNDLED_EDITLINE= EDITLINE_LIBS= JS_DISABLE_SHELL= @@ -3634,14 +3634,13 @@ if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then AC_MSG_ERROR([No system readline library found.])) else dnl By default, we use editline - JS_NATIVE_EDITLINE=1 - EDITLINE_LIBS='$(DEPTH)/js/src/editline/$(LIB_PREFIX)editline.$(LIB_SUFFIX)' + JS_BUNDLED_EDITLINE=1 fi dnl Either way, we want to build with line editing support. AC_DEFINE(EDITLINE) fi -AC_SUBST(JS_NATIVE_EDITLINE) +AC_SUBST(JS_BUNDLED_EDITLINE) AC_SUBST(JS_DISABLE_SHELL) AC_SUBST(EDITLINE_LIBS) @@ -3731,7 +3730,6 @@ AC_SUBST(ENABLE_STRIP) AC_SUBST(PKG_SKIP_STRIP) AC_SUBST(INCREMENTAL_LINKER) AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS) -AC_SUBST(MOZ_COMPONENT_NSPR_LIBS) AC_SUBST(MOZ_FIX_LINK_PATHS) diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in index 513aef4d3c5..7f419855935 100644 --- a/js/src/gdb/Makefile.in +++ b/js/src/gdb/Makefile.in @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) +LIBS += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) ifdef MOZ_SHARED_ICU EXTRA_LIBS += $(MOZ_ICU_LIBS) diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build index 25d4b3d607b..88bc33e61f3 100644 --- a/js/src/gdb/moz.build +++ b/js/src/gdb/moz.build @@ -25,3 +25,7 @@ for var in ('EXPORT_JS_API', 'IMPL_MFBT'): LOCAL_INCLUDES += ['..'] GENERATED_INCLUDES += ['..'] + +USE_LIBS += [ + 'static:js', +] diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in index cee9e0d66c0..2f042340510 100644 --- a/js/src/jsapi-tests/Makefile.in +++ b/js/src/jsapi-tests/Makefile.in @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) +LIBS += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) ifdef MOZ_SHARED_ICU EXTRA_LIBS += $(MOZ_ICU_LIBS) diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build index 60c92b88f98..de4ec7a077b 100644 --- a/js/src/jsapi-tests/moz.build +++ b/js/src/jsapi-tests/moz.build @@ -93,3 +93,7 @@ DEFINES['IMPL_MFBT'] = True LOCAL_INCLUDES += ['..'] GENERATED_INCLUDES += ['..'] + +USE_LIBS += [ + 'static:js', +] diff --git a/js/src/moz.build b/js/src/moz.build index 1c69cfaf4c3..2c5a5e053db 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -7,7 +7,7 @@ if CONFIG['DEHYDRA_PATH']: DIRS += ['analysis-tests'] -if CONFIG['JS_NATIVE_EDITLINE']: +if CONFIG['JS_BUNDLED_EDITLINE']: DIRS += ['editline'] # editline needs to get built before the shell @@ -18,8 +18,6 @@ TEST_DIRS += ['jsapi-tests', 'tests', 'gdb'] LOCAL_INCLUDES += ['../../mfbt/double-conversion'] -LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] - CONFIGURE_SUBST_FILES += [ 'devtools/rootAnalysis/Makefile', 'js-confdefs.h', @@ -29,6 +27,9 @@ CONFIGURE_SUBST_FILES += [ if CONFIG['JS_STANDALONE']: DEFINES['IMPL_MFBT'] = True + USE_LIBS += [ + 'mfbt', + ] else: CONFIGURE_SUBST_FILES += [ '../../config/autoconf-js.mk', @@ -426,13 +427,21 @@ HOST_SIMPLE_PROGRAMS += [ # In fact, we now build both a static and a shared library, as the # JS shell would like to link to the static library. +LIBRARY_NAME = 'js' + if CONFIG['JS_SHARED_LIBRARY']: FORCE_SHARED_LIB = True + SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] SDK_LIBRARY = True FORCE_STATIC_LIB = True STATIC_LIBRARY_NAME = 'js_static' +if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']: + USE_LIBS += [ + 'mozz', + ] + if CONFIG['MOZ_ETW']: GENERATED_FILES = [ 'ETWProvider.h', diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in index 0777e781ef0..74db4d298ca 100644 --- a/js/src/shell/Makefile.in +++ b/js/src/shell/Makefile.in @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS) +LIBS += $(NSPR_LIBS) $(EDITLINE_LIBS) $(MOZ_ZLIB_LIBS) ifdef MOZ_NATIVE_FFI EXTRA_LIBS += $(MOZ_FFI_LIBS) endif diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build index e9ac97a30d9..25f81b487be 100644 --- a/js/src/shell/moz.build +++ b/js/src/shell/moz.build @@ -6,6 +6,9 @@ if CONFIG['JS_SHELL_NAME']: PROGRAM = CONFIG['JS_SHELL_NAME'] + if CONFIG['JS_BUNDLED_EDITLINE']: + USE_LIBS += ['editline'] + USE_LIBS += ['static:js'] UNIFIED_SOURCES += [ 'js.cpp', diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in index 99cd141459e..963f3c87bc0 100644 --- a/js/xpconnect/shell/Makefile.in +++ b/js/xpconnect/shell/Makefile.in @@ -5,18 +5,8 @@ SDK_BINARY = $(PROGRAM) -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(LIBXUL_LIBS) \ - $(XPCOM_LIBS) \ - $(NULL) - LIBS += $(NSPR_LIBS) NSDISTMODE = copy -ifeq ($(OS_TEST),ia64) -LIBS += $(JEMALLOC_LIBS) -endif - include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index 04a4ad6c1c5..4058eff5a98 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -37,3 +37,9 @@ if CONFIG['_MSC_VER']: if CONFIG['OS_ARCH'] == 'WINNT': RCINCLUDE = 'xpcshell.rc' + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/js/xpconnect/tests/Makefile.in b/js/xpconnect/tests/Makefile.in index 34f9158f6c6..c58c503031d 100644 --- a/js/xpconnect/tests/Makefile.in +++ b/js/xpconnect/tests/Makefile.in @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(MOZ_COMPONENT_LIBS) \ +LIBS += \ + $(NSPR_LIBS) \ $(NULL) diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in index 576df685476..e611c4a2407 100644 --- a/js/xpconnect/tests/components/native/Makefile.in +++ b/js/xpconnect/tests/components/native/Makefile.in @@ -10,8 +10,7 @@ MANIFEST_PATH = $(testxpcobjdir)/$(componentdir) PP_TARGETS += MANIFEST EXTRA_DSO_LDOPTS += \ - $(XPCOM_GLUE_LDOPTS) \ - $(MOZ_COMPONENT_LIBS) \ + $(NSPR_LIBS) \ $(NULL) LIB_FILES = $(SHARED_LIBRARY) diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build index 991b5df85bc..6b34280a275 100644 --- a/js/xpconnect/tests/components/native/moz.build +++ b/js/xpconnect/tests/components/native/moz.build @@ -23,3 +23,9 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % ( ) FAIL_ON_WARNINGS = True + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/js/xpconnect/tests/moz.build b/js/xpconnect/tests/moz.build index 541d832006e..cf314fa523e 100644 --- a/js/xpconnect/tests/moz.build +++ b/js/xpconnect/tests/moz.build @@ -15,3 +15,8 @@ TEST_TOOL_DIRS += [ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in index af1505e5f86..333dc2c4666 100644 --- a/layout/media/Makefile.in +++ b/layout/media/Makefile.in @@ -4,7 +4,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. ifeq (WINNT,$(OS_TARGET)) -EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) OS_LIBS += $(call EXPAND_LIBNAME,usp10 ole32) endif diff --git a/layout/media/moz.build b/layout/media/moz.build index 28d283d8e22..9a29b5d85a3 100644 --- a/layout/media/moz.build +++ b/layout/media/moz.build @@ -8,6 +8,9 @@ LIBRARY_NAME = 'gkmedias' if CONFIG['GKMEDIAS_SHARED_LIBRARY']: FORCE_SHARED_LIB = True + USE_LIBS += [ + 'mozalloc', + ] if CONFIG['MOZ_WEBRTC']: DIRS += ['webrtc'] diff --git a/media/libcubeb/tests/Makefile.in b/media/libcubeb/tests/Makefile.in index 50b9248bdf8..1ec4fa515a8 100644 --- a/media/libcubeb/tests/Makefile.in +++ b/media/libcubeb/tests/Makefile.in @@ -3,29 +3,13 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ifeq ($(OS_ARCH),WINNT) - # On windows, the WASAPI backend needs the resampler we have in - # /media/libspeex_resampler, so we can't get away with just linking cubeb's .o - LIBS = $(call EXPAND_LIBNAME_PATH,gkmedias,$(DEPTH)/layout/media) \ - $(NULL) +ifeq ($(OS_TARGET),Darwin) + LIBS += -framework AudioUnit -framework CoreAudio else - # Otherwise, we can just grab all the compiled .o and compile against that, - # linking the appriopriate libraries. - LIBS = $(call EXPAND_LIBNAME_PATH,cubeb,$(DEPTH)/media/libcubeb/src) - # Don't link gkmedias for it introduces dependencies on Android. - ifeq ($(OS_TARGET),Android) - LIBS += $(call EXPAND_LIBNAME_PATH,speex,$(DEPTH)/media/libspeex_resampler/src) - endif - - ifeq ($(OS_TARGET),Darwin) - LIBS += -framework AudioUnit -framework CoreAudio + ifeq ($(OS_TARGET), OpenBSD) + LIBS += -lsndio else - ifeq ($(OS_TARGET), OpenBSD) - LIBS += -lsndio - else - LIBS += $(MOZ_ALSA_LIBS) \ - $(MOZ_PULSEAUDIO_LIBS) - endif + LIBS += $(MOZ_ALSA_LIBS) \ + $(MOZ_PULSEAUDIO_LIBS) endif - LIBS += $(NULL) endif diff --git a/media/libcubeb/tests/moz.build b/media/libcubeb/tests/moz.build index 7fb567614f1..a25e6d4dc15 100644 --- a/media/libcubeb/tests/moz.build +++ b/media/libcubeb/tests/moz.build @@ -23,3 +23,27 @@ LOCAL_INCLUDES += [ FAIL_ON_WARNINGS = True +if CONFIG['OS_ARCH'] == 'WINNT': + # On windows, the WASAPI backend needs the resampler we have in + # /media/libspeex_resampler, so we can't get away with just linking cubeb's + # .o + USE_LIBS += [ + 'gkmedias', + ] +else: + # Otherwise, we can just grab all the compiled .o and compile against that, + # linking the appriopriate libraries. + USE_LIBS += [ + 'cubeb', + ] + # Don't link gkmedias for it introduces dependencies on Android. + if CONFIG['OS_TARGET'] == 'Android': + USE_LIBS += [ + 'speex', + ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/media/mtransport/test/Makefile.in b/media/mtransport/test/Makefile.in index 3143018657d..5eb3f8c4f2f 100644 --- a/media/mtransport/test/Makefile.in +++ b/media/mtransport/test/Makefile.in @@ -3,13 +3,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ - $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ - $(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer/$(LIB_PREFIX)nicer.$(LIB_SUFFIX) \ - $(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit/$(LIB_PREFIX)nrappkit.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ $(NULL) ifdef MOZ_NATIVE_NSS @@ -23,10 +18,6 @@ LIBS += \ $(NULL) endif -ifdef MOZ_SCTP -LIBS += $(DEPTH)/netwerk/sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX) -endif - ifeq ($(OS_TARGET), Android) LIBS += \ $(STLPORT_LDFLAGS) \ diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build index 87bfb0b5066..e1838685d6b 100644 --- a/media/mtransport/test/moz.build +++ b/media/mtransport/test/moz.build @@ -83,3 +83,17 @@ LOCAL_INCLUDES += [ '/netwerk/sctp/src/', ] +USE_LIBS += [ + '/media/webrtc/trunk/testing/gtest_gtest/gtest', + 'mozalloc', + 'mtransport_s', + 'nicer', + 'nrappkit', + 'xpcomglue_s', + 'xul-shared', +] + +if CONFIG['MOZ_SCTP']: + USE_LIBS += [ + 'nksctp_s', + ] diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in index a8e3fd0a78f..268a6d7b493 100644 --- a/media/omx-plugin/Makefile.in +++ b/media/omx-plugin/Makefile.in @@ -19,13 +19,4 @@ EXTRA_DSO_LDOPTS += \ -lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \ -lhardware -lcutils \ $(NULL) -else -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libutils \ - -lutils \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libstagefright \ - -lstagefright \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \ - -lvideoeditorplayer \ - $(NULL) endif diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in deleted file mode 100644 index 3ef91b2da64..00000000000 --- a/media/omx-plugin/froyo/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - -L$(DEPTH)/media/omx-plugin/lib/froyo/libstagefright \ - -lstagefright \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \ - -lstagefright_color_conversion \ - $(NULL) - diff --git a/media/omx-plugin/froyo/moz.build b/media/omx-plugin/froyo/moz.build index ac6f10cbfd3..a65f7c874aa 100644 --- a/media/omx-plugin/froyo/moz.build +++ b/media/omx-plugin/froyo/moz.build @@ -18,6 +18,12 @@ LOCAL_INCLUDES += [ '../include/froyo/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/froyo/libstagefright/stagefright', + '/media/omx-plugin/lib/gb/libutils/utils', + 'stagefright_color_conversion', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in deleted file mode 100644 index 6261176b211..00000000000 --- a/media/omx-plugin/gb/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright \ - -lstagefright \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \ - -lstagefright_color_conversion \ - $(NULL) - diff --git a/media/omx-plugin/gb/moz.build b/media/omx-plugin/gb/moz.build index b4741e58ad4..0a5eae2ca4e 100644 --- a/media/omx-plugin/gb/moz.build +++ b/media/omx-plugin/gb/moz.build @@ -18,6 +18,12 @@ LOCAL_INCLUDES += [ '../include/gb/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libstagefright/stagefright', + '/media/omx-plugin/lib/gb/libutils/utils', + 'stagefright_color_conversion', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in deleted file mode 100644 index 6fda5a5639f..00000000000 --- a/media/omx-plugin/gb235/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - -L$(DEPTH)/media/omx-plugin/lib/gb235/libstagefright \ - -lstagefright \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \ - -lstagefright_color_conversion \ - $(NULL) - diff --git a/media/omx-plugin/gb235/moz.build b/media/omx-plugin/gb235/moz.build index cb1d18b3c38..758af2c4d85 100644 --- a/media/omx-plugin/gb235/moz.build +++ b/media/omx-plugin/gb235/moz.build @@ -18,6 +18,12 @@ LOCAL_INCLUDES += [ '../include/gb/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libutils/utils', + '/media/omx-plugin/lib/gb235/libstagefright/stagefright', + 'stagefright_color_conversion', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in deleted file mode 100644 index fe26b7596dc..00000000000 --- a/media/omx-plugin/hc/Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - -L$(DEPTH)/media/omx-plugin/lib/hc/libstagefright \ - -lstagefright \ - $(NULL) - diff --git a/media/omx-plugin/hc/moz.build b/media/omx-plugin/hc/moz.build index 86fd198fb1a..4d5079cb0a1 100644 --- a/media/omx-plugin/hc/moz.build +++ b/media/omx-plugin/hc/moz.build @@ -18,6 +18,11 @@ LOCAL_INCLUDES += [ '../include/gb/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libutils/utils', + '/media/omx-plugin/lib/hc/libstagefright/stagefright', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/kk/Makefile.in b/media/omx-plugin/kk/Makefile.in deleted file mode 100644 index 9e6be39d253..00000000000 --- a/media/omx-plugin/kk/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libutils \ - -lutils \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libstagefright \ - -lstagefright \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \ - -lvideoeditorplayer \ - $(NULL) - diff --git a/media/omx-plugin/kk/moz.build b/media/omx-plugin/kk/moz.build index bf8fdfe7988..d021c23c917 100644 --- a/media/omx-plugin/kk/moz.build +++ b/media/omx-plugin/kk/moz.build @@ -18,6 +18,12 @@ LOCAL_INCLUDES += [ '../include/ics/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/ics/libstagefright/stagefright', + '/media/omx-plugin/lib/ics/libutils/utils', + 'videoeditorplayer', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in deleted file mode 100644 index a6272b4ea70..00000000000 --- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - $(NULL) diff --git a/media/omx-plugin/lib/froyo/libstagefright/moz.build b/media/omx-plugin/lib/froyo/libstagefright/moz.build index 57bcb0cb03a..2061ad10a8d 100644 --- a/media/omx-plugin/lib/froyo/libstagefright/moz.build +++ b/media/omx-plugin/lib/froyo/libstagefright/moz.build @@ -19,6 +19,10 @@ LOCAL_INCLUDES += [ '/media/omx-plugin/include/froyo/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libutils/utils', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in deleted file mode 100644 index a6272b4ea70..00000000000 --- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - $(NULL) diff --git a/media/omx-plugin/lib/gb/libstagefright/moz.build b/media/omx-plugin/lib/gb/libstagefright/moz.build index b9ee83acf1d..3d9a3da02e0 100644 --- a/media/omx-plugin/lib/gb/libstagefright/moz.build +++ b/media/omx-plugin/lib/gb/libstagefright/moz.build @@ -19,6 +19,10 @@ LOCAL_INCLUDES += [ '/media/omx-plugin/include/gb/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libutils/utils', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in deleted file mode 100644 index a6272b4ea70..00000000000 --- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - $(NULL) diff --git a/media/omx-plugin/lib/gb235/libstagefright/moz.build b/media/omx-plugin/lib/gb235/libstagefright/moz.build index b9ee83acf1d..3d9a3da02e0 100644 --- a/media/omx-plugin/lib/gb235/libstagefright/moz.build +++ b/media/omx-plugin/lib/gb235/libstagefright/moz.build @@ -19,6 +19,10 @@ LOCAL_INCLUDES += [ '/media/omx-plugin/include/gb/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libutils/utils', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in deleted file mode 100644 index a6272b4ea70..00000000000 --- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ - -lutils \ - $(NULL) diff --git a/media/omx-plugin/lib/hc/libstagefright/moz.build b/media/omx-plugin/lib/hc/libstagefright/moz.build index b9ee83acf1d..3d9a3da02e0 100644 --- a/media/omx-plugin/lib/hc/libstagefright/moz.build +++ b/media/omx-plugin/lib/hc/libstagefright/moz.build @@ -19,6 +19,10 @@ LOCAL_INCLUDES += [ '/media/omx-plugin/include/gb/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/gb/libutils/utils', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in deleted file mode 100644 index bb94a747f31..00000000000 --- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2012 Mozilla Foundation and Mozilla contributors -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS += \ - -L$(DEPTH)/media/omx-plugin/lib/ics/libutils \ - -lutils \ - $(NULL) diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build index f02e5849fc6..3f95e12fc84 100644 --- a/media/omx-plugin/lib/ics/libstagefright/moz.build +++ b/media/omx-plugin/lib/ics/libstagefright/moz.build @@ -19,6 +19,10 @@ LOCAL_INCLUDES += [ '/media/omx-plugin/include/ics/media/stagefright/openmax', ] +USE_LIBS += [ + '/media/omx-plugin/lib/ics/libutils/utils', +] + # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True NO_VISIBILITY_FLAGS = True diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build index e36bba8073a..d7c35ee1818 100644 --- a/media/omx-plugin/moz.build +++ b/media/omx-plugin/moz.build @@ -53,6 +53,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'hardware/libhardware/include', ] ] +else: + USE_LIBS += [ + '/media/omx-plugin/lib/ics/libstagefright/stagefright', + '/media/omx-plugin/lib/ics/libutils/utils', + 'videoeditorplayer', + ] # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in index 432945da0b7..c7180883272 100644 --- a/media/webrtc/signaling/test/Makefile.in +++ b/media/webrtc/signaling/test/Makefile.in @@ -2,31 +2,13 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. */ -LIBS = \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NSS_LIBS) \ $(MOZ_WEBRTC_X11_LIBS) \ $(REALTIME_LIBS) \ - $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ - $(DEPTH)/layout/media/webrtc/$(LIB_PREFIX)webrtc.$(LIB_SUFFIX) \ - $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ - $(DEPTH)/media/libyuv/libyuv_libyuv/$(LIB_PREFIX)yuv.$(LIB_SUFFIX) \ - $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ $(NULL) -ifdef BUILD_ARM_NEON -LIBS += $(DEPTH)/media/libyuv/libyuv_libyuv_neon/$(LIB_PREFIX)yuv_neon.$(LIB_SUFFIX) -endif - -ifdef JS_SHARED_LIBRARY -LIBS += $(MOZ_JS_LIBS) -endif - ifdef MOZ_ALSA LIBS += \ $(MOZ_ALSA_LIBS) \ @@ -96,13 +78,7 @@ LIBS += \ $(NULL) endif -ifeq ($(OS_TARGET),WINNT) -LIBS += \ - $(DEPTH)/staticlib/components/$(LIB_PREFIX)windowsproxy.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifndef ZLIB_IN_MOZGLUE +ifdef MOZ_NATIVE_ZLIB LIBS += $(MOZ_ZLIB_LIBS) endif diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build index f7dd9074c8e..070625543e1 100644 --- a/media/webrtc/signaling/test/moz.build +++ b/media/webrtc/signaling/test/moz.build @@ -92,3 +92,32 @@ if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'): '/media/mtransport/third_party/nrappkit/src/port/darwin/include', '/media/mtransport/third_party/nrappkit/src/port/generic/include', ] + +USE_LIBS += [ + '/media/webrtc/signalingtest/signaling_ecc/ecc', + '/media/webrtc/signalingtest/signaling_sipcc/sipcc', + '/media/webrtc/trunk/testing/gtest_gtest/gtest', + 'gkmedias', + 'mozalloc', + 'mtransport_s', + 'nksrtp_s', + 'webrtc', + 'xpcomglue_s', + 'xul-shared', + 'yuv', +] + +if CONFIG['BUILD_ARM_NEON']: + USE_LIBS += [ + 'yuv_neon', + ] + +if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']: + USE_LIBS += [ + 'mozz', + ] + +if CONFIG['JS_SHARED_LIBRARY']: + USE_LIBS += [ + 'js', + ] diff --git a/memory/build/Makefile.in b/memory/build/Makefile.in index 691f3640f06..fd9086f973e 100644 --- a/memory/build/Makefile.in +++ b/memory/build/Makefile.in @@ -6,11 +6,3 @@ STLFLAGS = ifdef MOZ_GLUE_PROGRAM_LDFLAGS DIST_INSTALL = 1 endif - -ifdef MOZ_JEMALLOC3 -ifndef MOZ_NATIVE_JEMALLOC -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) -endif -else -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) -endif diff --git a/memory/build/moz.build b/memory/build/moz.build index d5f5c477dbd..447d02f85a4 100644 --- a/memory/build/moz.build +++ b/memory/build/moz.build @@ -38,6 +38,16 @@ if CONFIG['MOZ_REPLACE_MALLOC']: LIBRARY_NAME = 'memory' +if CONFIG['MOZ_JEMALLOC3']: + if not CONFIG['MOZ_NATIVE_JEMALLOC']: + USE_LIBS += [ + 'jemalloc', + ] +else: + USE_LIBS += [ + 'mozjemalloc', + ] + if CONFIG['MOZ_GLUE_PROGRAM_LDFLAGS']: SDK_LIBRARY = True diff --git a/memory/mozalloc/tests/moz.build b/memory/mozalloc/tests/moz.build index fa0c0769c5e..7730be1a078 100644 --- a/memory/mozalloc/tests/moz.build +++ b/memory/mozalloc/tests/moz.build @@ -9,3 +9,9 @@ CPP_UNIT_TESTS += [ ] SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/memory/mozjemalloc/moz.build b/memory/mozjemalloc/moz.build index e6eca9440cd..d5b58e5ea5d 100644 --- a/memory/mozjemalloc/moz.build +++ b/memory/mozjemalloc/moz.build @@ -12,7 +12,8 @@ if not CONFIG['MOZ_JEMALLOC3']: SOURCES += [ 'jemalloc.c', ] - LIBRARY_NAME = 'jemalloc' + LIBRARY_NAME = 'mozjemalloc' + STATIC_LIBRARY_NAME = 'jemalloc' FORCE_STATIC_LIB = True # For non release/esr builds, enable (some) fatal jemalloc assertions. This diff --git a/memory/replace/jemalloc/Makefile.in b/memory/replace/jemalloc/Makefile.in index e2f36b9fce8..1c9745020a8 100644 --- a/memory/replace/jemalloc/Makefile.in +++ b/memory/replace/jemalloc/Makefile.in @@ -2,7 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) - MOZ_GLUE_LDFLAGS = # Don't link against mozglue WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap diff --git a/memory/replace/jemalloc/moz.build b/memory/replace/jemalloc/moz.build index 116b51da2f5..1759d60cab0 100644 --- a/memory/replace/jemalloc/moz.build +++ b/memory/replace/jemalloc/moz.build @@ -19,6 +19,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': LIBRARY_NAME = 'replace_jemalloc' +USE_LIBS += [ + 'jemalloc', +] + FORCE_SHARED_LIB = True DEFINES['MOZ_JEMALLOC3'] = True diff --git a/mfbt/tests/Makefile.in b/mfbt/tests/Makefile.in index c154f9aa480..92728af0490 100644 --- a/mfbt/tests/Makefile.in +++ b/mfbt/tests/Makefile.in @@ -11,6 +11,7 @@ MOZ_GLUE_PROGRAM_LDFLAGS= MOZ_GLUE_LDFLAGS = WRAP_LDFLAGS= -include $(topsrcdir)/config/rules.mk +# Prevent those tests linking against libxpcom, libxul, and nspr. +NSPR_LIBS= -LIBS= $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) +include $(topsrcdir)/config/rules.mk diff --git a/mfbt/tests/moz.build b/mfbt/tests/moz.build index 57eb2fa8a0f..b7810dbd116 100644 --- a/mfbt/tests/moz.build +++ b/mfbt/tests/moz.build @@ -48,3 +48,7 @@ if CONFIG['_MSC_VER']: ] FAIL_ON_WARNINGS = True + +USE_LIBS += [ + 'mfbt', +] diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index 0d3f90805a9..e1141ad811f 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -17,12 +17,8 @@ HOST_CFLAGS += \ $(DEFINES) \ $(NULL) -LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) - ifdef MOZ_ENABLE_SIGNMAR LIBS += \ - $(DEPTH)/modules/libmar/sign/$(LIB_PREFIX)signmar.$(LIB_SUFFIX) \ - $(DEPTH)/modules/libmar/verify/$(LIB_PREFIX)verifymar.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NSPR_LIBS) \ diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index bcf08ac622f..c38519863de 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -30,3 +30,13 @@ elif CONFIG['OS_ARCH'] == 'Darwin': LDFLAGS += [ '-framework Security', ] + +USE_LIBS += [ + 'mar', +] + +if CONFIG['MOZ_ENABLE_SIGNMAR']: + USE_LIBS += [ + 'signmar', + 'verifymar', + ] diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in index 7058d2e50f0..9800b6ce834 100644 --- a/mozglue/build/Makefile.in +++ b/mozglue/build/Makefile.in @@ -10,13 +10,9 @@ include $(topsrcdir)/config/config.mk MOZ_GLUE_LDFLAGS = # Don't link against ourselves -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) - ifneq (,$(ZLIB_IN_MOZGLUE)$(MOZ_LINKER)) ifdef MOZ_NATIVE_ZLIB EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS) -else -SHARED_LIBRARY_LIBS += $(MOZ_ZLIB_LIBS) endif endif diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build index ff1b4cf1d70..9095720d1d5 100644 --- a/mozglue/build/moz.build +++ b/mozglue/build/moz.build @@ -68,6 +68,15 @@ if CONFIG['MOZ_ASAN']: LIBRARY_NAME = 'mozglue' +USE_LIBS += [ + 'mfbt', +] + +if CONFIG['ZLIB_IN_MOZGLUE'] and not CONFIG['MOZ_NATIVE_ZLIB']: + USE_LIBS += [ + 'mozz', + ] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': SOURCES += [ 'cpuacct.c', diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in index d93c6fdb4f7..258eaf0382a 100644 --- a/mozglue/tests/Makefile.in +++ b/mozglue/tests/Makefile.in @@ -6,8 +6,6 @@ ifdef MOZ_LINKER # Only link against the linker, not mozglue MOZ_GLUE_PROGRAM_LDFLAGS = MOZ_GLUE_LDFLAGS = -LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker) - EXTRA_LIBS = $(MOZ_ZLIB_LIBS) endif diff --git a/mozglue/tests/moz.build b/mozglue/tests/moz.build index a0dbb6bc834..f4199be31e6 100644 --- a/mozglue/tests/moz.build +++ b/mozglue/tests/moz.build @@ -15,4 +15,7 @@ if CONFIG['MOZ_LINKER']: 'TestZip', ] LOCAL_INCLUDES += ['../linker'] + USE_LIBS += [ + 'linker', + ] DISABLE_STL_WRAPPING = True diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in index 7d377f1d1a4..d39ca01e39c 100644 --- a/netwerk/streamconv/test/Makefile.in +++ b/netwerk/streamconv/test/Makefile.in @@ -3,9 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/netwerk/streamconv/test/moz.build b/netwerk/streamconv/test/moz.build index 51857b0cb42..08fe527bb54 100644 --- a/netwerk/streamconv/test/moz.build +++ b/netwerk/streamconv/test/moz.build @@ -19,3 +19,9 @@ if CONFIG['OS_ARCH'] == 'WINNT': LDFLAGS += ['-mconsole'] else: LDFLAGS += ['-SUBSYSTEM:CONSOLE'] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in index 0da965a2198..28b0756502b 100644 --- a/netwerk/test/Makefile.in +++ b/netwerk/test/Makefile.in @@ -6,7 +6,7 @@ -LIBS = $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build index c9c483c7559..334a3c07874 100644 --- a/netwerk/test/moz.build +++ b/netwerk/test/moz.build @@ -62,3 +62,9 @@ RESOURCE_FILES += [ 'urlparse.dat', 'urlparse_unx.dat', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in index d98a1509f87..d0722062bad 100644 --- a/rdf/tests/rdfcat/Makefile.in +++ b/rdf/tests/rdfcat/Makefile.in @@ -3,9 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/rdf/tests/rdfcat/moz.build b/rdf/tests/rdfcat/moz.build index 5dfbdd3b2b4..9842758f7a1 100644 --- a/rdf/tests/rdfcat/moz.build +++ b/rdf/tests/rdfcat/moz.build @@ -9,3 +9,9 @@ PROGRAM = 'rdfcat' SOURCES += [ 'rdfcat.cpp', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index 93c97156a24..b30688ed52c 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/rdf/tests/rdfpoll/moz.build b/rdf/tests/rdfpoll/moz.build index ca8ffb9889e..d601a2201e2 100644 --- a/rdf/tests/rdfpoll/moz.build +++ b/rdf/tests/rdfpoll/moz.build @@ -9,3 +9,9 @@ PROGRAM = 'rdfpoll' SOURCES += [ 'rdfpoll.cpp', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in index d98a1509f87..d0722062bad 100644 --- a/rdf/tests/triplescat/Makefile.in +++ b/rdf/tests/triplescat/Makefile.in @@ -3,9 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/rdf/tests/triplescat/moz.build b/rdf/tests/triplescat/moz.build index c1383c18d11..d4ea17f73ac 100644 --- a/rdf/tests/triplescat/moz.build +++ b/rdf/tests/triplescat/moz.build @@ -9,3 +9,9 @@ PROGRAM = 'triplescat' SOURCES += [ 'triplescat.cpp', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/security/build/Makefile.in b/security/build/Makefile.in index ce34e7bbe7b..6b1b8e44d68 100644 --- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -329,11 +329,8 @@ EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/pr/src/$(LIB_PREFIX)nspr4$(SUFFIX) EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/lib/ds/$(LIB_PREFIX)plds4$(SUFFIX) EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/lib/libc/src/$(LIB_PREFIX)plc4$(SUFFIX) -# Fold SQLite -EXTRA_DSO_LDOPTS += $(DEPTH)/db/sqlite3/src/$(LIB_PREFIX)mozsqlite3.$(LIB_SUFFIX) - # Add all static libraries for nss, smime, ssl and nssutil -SHARED_LIBRARY_LIBS = $(addprefix ../,$(NSS_STATIC_LIBS)) +SHARED_LIBRARY_LIBS += $(addprefix ../,$(NSS_STATIC_LIBS)) nss_def_file := $(srcdir)/nss.def @@ -369,7 +366,7 @@ ifdef MOZ_FOLD_LIBS # Force the linker to include everything from the static libraries. EXPAND_LIBS_EXEC += --extract -$(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) +$(SHARED_LIBRARY): $(addprefix ../,$(NSS_STATIC_LIBS)) EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) diff --git a/security/build/moz.build b/security/build/moz.build index 8edf8fb0e6d..38dca59a0d7 100644 --- a/security/build/moz.build +++ b/security/build/moz.build @@ -11,6 +11,10 @@ if CONFIG['MOZ_FOLD_LIBS']: FORCE_SHARED_LIB = True SDK_LIBRARY = True + USE_LIBS += [ + 'mozsqlite3', + ] + if CONFIG['OS_TARGET'] == 'WINNT': DEFFILE = 'nss3.def' diff --git a/security/manager/ssl/tests/compiled/moz.build b/security/manager/ssl/tests/compiled/moz.build index 32a2059492a..74e424a566c 100644 --- a/security/manager/ssl/tests/compiled/moz.build +++ b/security/manager/ssl/tests/compiled/moz.build @@ -9,3 +9,9 @@ CPP_UNIT_TESTS += [ ] SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in index d045112c8c9..e25bc56247c 100644 --- a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in +++ b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in @@ -6,13 +6,9 @@ include $(topsrcdir)/config/config.mk -LIBS = \ +LIBS += \ $(NSPR_LIBS) \ $(NSS_LIBS) \ - $(MOZALLOC_LIB) \ - ../../../../../../pkix/$(LIB_PREFIX)mozillapkix.$(LIB_SUFFIX) \ - ../../../../../../pkix/test/lib/$(LIB_PREFIX)pkixtestutil.$(LIB_SUFFIX) \ - ../lib/$(LIB_PREFIX)tlsserver.$(LIB_SUFFIX) \ $(NULL) DEFINES += $(TK_CFLAGS) diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build b/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build index 23a8f4cc09f..9e808ba0bb8 100644 --- a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build +++ b/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build @@ -20,3 +20,9 @@ LOCAL_INCLUDES += [ '../lib', ] +USE_LIBS += [ + 'mozalloc', + 'mozillapkix', + 'pkixtestutil', + 'tlsserver', +] diff --git a/security/sandbox/win/src/sandboxbroker/Makefile.in b/security/sandbox/win/src/sandboxbroker/Makefile.in index 9393b2dfa2e..ef247bed59d 100644 --- a/security/sandbox/win/src/sandboxbroker/Makefile.in +++ b/security/sandbox/win/src/sandboxbroker/Makefile.in @@ -5,7 +5,6 @@ MOZ_GLUE_LDFLAGS = SHARED_LIBRARY_LIBS += \ - ../../../$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX) \ $(NSPR_LIBS) \ $(NULL) diff --git a/security/sandbox/win/src/sandboxbroker/moz.build b/security/sandbox/win/src/sandboxbroker/moz.build index 816eec08102..d50edc29947 100644 --- a/security/sandbox/win/src/sandboxbroker/moz.build +++ b/security/sandbox/win/src/sandboxbroker/moz.build @@ -6,6 +6,10 @@ LIBRARY_NAME = 'sandboxbroker' +USE_LIBS += [ + 'sandbox_s', +] + SOURCES += [ 'sandboxBroker.cpp', ] diff --git a/startupcache/test/Makefile.in b/startupcache/test/Makefile.in index 9bd1b637835..ea438c97258 100644 --- a/startupcache/test/Makefile.in +++ b/startupcache/test/Makefile.in @@ -3,4 +3,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS += $(MOZ_COMPONENT_LIBS) +LIBS += $(NSPR_LIBS) diff --git a/startupcache/test/moz.build b/startupcache/test/moz.build index a992af620bf..d00a2151e06 100644 --- a/startupcache/test/moz.build +++ b/startupcache/test/moz.build @@ -14,3 +14,9 @@ EXTRA_COMPONENTS += [ 'TestStartupCacheTelemetry.js', 'TestStartupCacheTelemetry.manifest', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in index 76c13b082f3..fdda5cde6d4 100644 --- a/storage/test/Makefile.in +++ b/storage/test/Makefile.in @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(MOZ_COMPONENT_LIBS) \ +LIBS += \ + $(NSPR_LIBS) \ $(SQLITE_LIBS) \ $(NULL) diff --git a/storage/test/moz.build b/storage/test/moz.build index 28984f2b3b8..825e11c1076 100644 --- a/storage/test/moz.build +++ b/storage/test/moz.build @@ -35,3 +35,14 @@ LOCAL_INCLUDES += [ ] FAIL_ON_WARNINGS = True + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] + +if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']: + USE_LIBS += [ + 'mozsqlite3', + ] diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in index 16214651cc2..b983c2418a7 100644 --- a/testing/mochitest/ssltunnel/Makefile.in +++ b/testing/mochitest/ssltunnel/Makefile.in @@ -6,5 +6,4 @@ LIBS = \ $(NSPR_LIBS) \ $(NSS_LIBS) \ - $(MOZALLOC_LIB) \ $(NULL) diff --git a/testing/mochitest/ssltunnel/moz.build b/testing/mochitest/ssltunnel/moz.build index 835e3237925..b97d03831ae 100644 --- a/testing/mochitest/ssltunnel/moz.build +++ b/testing/mochitest/ssltunnel/moz.build @@ -10,6 +10,10 @@ SOURCES += [ 'ssltunnel.cpp', ] +USE_LIBS += [ + 'mozalloc', +] + # This isn't XPCOM code, but it wants to use STL, so disable the STL # wrappers DISABLE_STL_WRAPPING = True diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in index b9d4fdc86fa..60d248d296c 100644 --- a/toolkit/components/ctypes/tests/Makefile.in +++ b/toolkit/components/ctypes/tests/Makefile.in @@ -2,8 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB) - LIB_1_FILES = $(SHARED_LIBRARY) LIB_1_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit INSTALL_TARGETS += LIB_1 diff --git a/toolkit/components/ctypes/tests/moz.build b/toolkit/components/ctypes/tests/moz.build index 1789de2ce65..2db986b2572 100644 --- a/toolkit/components/ctypes/tests/moz.build +++ b/toolkit/components/ctypes/tests/moz.build @@ -22,3 +22,6 @@ LOCAL_INCLUDES += [ '/js/src/ctypes', ] +USE_LIBS += [ + 'mozalloc', +] diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in index 78374c7d763..c858dac29f6 100644 --- a/toolkit/components/maintenanceservice/Makefile.in +++ b/toolkit/components/maintenanceservice/Makefile.in @@ -9,12 +9,6 @@ DIST_PROGRAM = maintenanceservice$(BIN_SUFFIX) MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = -ifeq ($(OS_ARCH),WINNT) -LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../../mozapps/update/common-standalone) -else -LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../../mozapps/update/common) -endif - OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32) ifndef MOZ_WINCONSOLE diff --git a/toolkit/components/maintenanceservice/moz.build b/toolkit/components/maintenanceservice/moz.build index 06532c3ba06..cfc2b245610 100644 --- a/toolkit/components/maintenanceservice/moz.build +++ b/toolkit/components/maintenanceservice/moz.build @@ -15,6 +15,15 @@ SOURCES += [ 'workmonitor.cpp', ] +if CONFIG['OS_ARCH'] == 'WINNT': + USE_LIBS += [ + 'updatecommon-standalone', + ] +else: + USE_LIBS += [ + 'updatecommon', + ] + # For debugging purposes only #DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in deleted file mode 100644 index 072006b7687..00000000000 --- a/toolkit/components/places/tests/cpp/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. */ - -ifdef JS_SHARED_LIBRARY -LIBS += $(MOZ_JS_LIBS) -endif diff --git a/toolkit/components/places/tests/cpp/moz.build b/toolkit/components/places/tests/cpp/moz.build index 1a2c3cca5f1..e467231a668 100644 --- a/toolkit/components/places/tests/cpp/moz.build +++ b/toolkit/components/places/tests/cpp/moz.build @@ -12,3 +12,13 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS) FAIL_ON_WARNINGS = True +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] + +if CONFIG['JS_SHARED_LIBRARY']: + USE_LIBS += [ + 'js', + ] diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index 0a4cbe4c3e0..7c44b0d06d8 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -12,33 +12,16 @@ MOZ_GLUE_PROGRAM_LDFLAGS = endif ifeq ($(OS_ARCH),WINNT) -LIBS += \ - $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX) - $(NULL) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 shell32 wininet shlwapi) MOZ_WINCONSOLE = 0 endif -ifeq ($(OS_ARCH),Darwin) -LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \ - $(NULL) -endif - ifdef MOZ_WIDGET_GTK - -LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \ - $(NULL) OS_CXXFLAGS += $(TK_CFLAGS) $(MOZ_GTHREAD_CFLAGS) OS_LIBS += $(TK_LIBS) $(MOZ_GTHREAD_LIBS) endif ifeq ($(OS_ARCH),SunOS) -LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \ - $(NULL) OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS) OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) endif diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build index 6728e2dba38..e0ca1e7b07e 100644 --- a/toolkit/crashreporter/client/moz.build +++ b/toolkit/crashreporter/client/moz.build @@ -22,6 +22,9 @@ if CONFIG['OS_ARCH'] == 'WINNT': ] DEFINES['UNICODE'] = True DEFINES['_UNICODE'] = True + USE_LIBS += [ + 'google_breakpad_libxul_s', + ] elif CONFIG['OS_ARCH'] == 'Darwin': UNIFIED_SOURCES += [ 'crashreporter_osx.mm', @@ -31,11 +34,18 @@ elif CONFIG['OS_ARCH'] == 'Darwin': '../google-breakpad/src/common/mac', ] LDFLAGS += ['-framework Cocoa'] + USE_LIBS += [ + 'breakpad_common_s', + 'breakpad_mac_common_s', + ] elif CONFIG['OS_ARCH'] == 'SunOS': SOURCES += [ 'crashreporter_linux.cpp', 'crashreporter_unix.cpp', ] + USE_LIBS += [ + 'breakpad_solaris_common_s', + ] if CONFIG['MOZ_ENABLE_GTK']: UNIFIED_SOURCES += [ @@ -43,6 +53,9 @@ if CONFIG['MOZ_ENABLE_GTK']: 'crashreporter_linux.cpp', 'crashreporter_unix_common.cpp' ] + USE_LIBS += [ + 'breakpad_linux_common_s', + ] RCINCLUDE = 'crashreporter.rc' diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in index b3e06a3b690..0a5ada10b2c 100644 --- a/toolkit/crashreporter/test/Makefile.in +++ b/toolkit/crashreporter/test/Makefile.in @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) UNIT_FILES = $(SHARED_LIBRARY) $(EXTRA_JS_MODULES) UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/ diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build index 16a6fca7b5a..a3ca5c4a316 100644 --- a/toolkit/crashreporter/test/moz.build +++ b/toolkit/crashreporter/test/moz.build @@ -38,3 +38,9 @@ LOCAL_INCLUDES += [ ] include('/toolkit/crashreporter/crashreporter.mozbuild') + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 217daa3b026..9d4c667d4bb 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -2,10 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -ifeq ($(OS_ARCH),WINNT) - SHARED_LIBRARY_LIBS += ../../security/sandbox/win/src/sandboxbroker/$(LIB_PREFIX)sandboxbroker.$(LIB_SUFFIX) -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) endif diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk index 8a37d6b8af3..b5ee1324931 100644 --- a/toolkit/library/libxul.mk +++ b/toolkit/library/libxul.mk @@ -2,8 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,xul,$(DEPTH)/toolkit/library) - EXTRA_DEPS += $(topsrcdir)/toolkit/library/libxul.mk # dependent libraries @@ -35,7 +33,6 @@ OS_LIBS += -lcups endif EXTRA_DSO_LDOPTS += \ - $(MOZ_JS_LIBS) \ $(NSS_LIBS) \ $(MOZ_CAIRO_OSLIBS) \ $(MOZ_WEBRTC_X11_LIBS) \ @@ -44,11 +41,15 @@ EXTRA_DSO_LDOPTS += \ $(NULL) ifdef ENABLE_INTL_API -ifdef JS_SHARED_LIBRARY +ifneq (,$(JS_SHARED_LIBRARY)$(MOZ_NATIVE_ICU)) EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) endif endif +ifdef MOZ_NATIVE_FFI +EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS) +endif + ifdef MOZ_NATIVE_JPEG EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS) endif @@ -57,7 +58,7 @@ ifdef MOZ_NATIVE_PNG EXTRA_DSO_LDOPTS += $(MOZ_PNG_LIBS) endif -ifndef ZLIB_IN_MOZGLUE +ifdef MOZ_NATIVE_ZLIB EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS) endif @@ -77,12 +78,6 @@ ifndef MOZ_TREE_PIXMAN EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) endif -ifdef MOZ_DMD -EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib) -endif - -EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DEPTH)/layout/media) - ifdef MOZ_WEBRTC ifeq (WINNT,$(OS_TARGET)) ifndef MOZ_HAS_WINSDK_WITH_D3D @@ -138,7 +133,9 @@ ifdef MOZ_DIRECTSHOW OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) endif -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(ICONV_LIBS) + +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) OS_LIBS += \ @@ -156,7 +153,7 @@ endif ifdef MOZ_WIDGET_GTK ifdef MOZ_ENABLE_GTK3 -EXTRA_DSO_LDOPTS += $(filter-out -lgtk-3 -lgdk-3,$(TK_LIBS)) -lmozgtk_stub +EXTRA_DSO_LDOPTS += $(filter-out -lgtk-3 -lgdk-3,$(TK_LIBS)) else EXTRA_DSO_LDOPTS += $(TK_LIBS) endif @@ -203,10 +200,6 @@ OS_LIBS += $(call EXPAND_LIBNAME,uiautomationcore runtimeobject) endif endif # WINNT -ifdef MOZ_JPROF -EXTRA_DSO_LDOPTS += -ljprof -endif - ifdef MOZ_ENABLE_QT EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS) endif @@ -234,8 +227,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) OS_LIBS += $(call EXPAND_LIBNAME,usp10 oleaut32) endif -EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,StaticXULComponentsEnd,$(DEPTH)/toolkit/library/StaticXULComponentsEnd) - # BFD ld doesn't create multiple PT_LOADs as usual when an unknown section # exists. Using an implicit linker script to make it fold that section in # .data.rel.ro makes it create multiple PT_LOADs. That implicit linker diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild index 8ffa8df71b1..3b66bcfaf5a 100644 --- a/toolkit/library/libxul.mozbuild +++ b/toolkit/library/libxul.mozbuild @@ -57,3 +57,51 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: ] # This file is (only) included from subdirectories, and the file is here. RCINCLUDE = '../xulrunner.rc' + +USE_LIBS += [ + 'xul', +] + +# js needs to come after xul for now, because it is an archive and its content +# is discarded when it comes first. +USE_LIBS += [ + 'js', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + USE_LIBS += [ + 'sandboxbroker', + ] + +if CONFIG['MOZ_DMD']: + USE_LIBS += [ + 'dmd', + ] + +if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']: + USE_LIBS += [ + 'mozz', + ] + +if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']: + USE_LIBS += [ + 'mozsqlite3', + ] + +USE_LIBS += [ + 'gkmedias', + 'mozalloc', +] + +if CONFIG['MOZ_WIDGET_GTK'] and CONFIG['MOZ_ENABLE_GTK3']: + USE_LIBS += [ + 'mozgtk_stub', + ] + +if CONFIG['MOZ_JPROF']: + USE_LIBS += [ + 'jprof', + ] + +# This needs to be last +USE_LIBS += ['StaticXULComponentsEnd'] diff --git a/toolkit/mozapps/update/tests/Makefile.in b/toolkit/mozapps/update/tests/Makefile.in index 3eb2cbb4e94..c3e2785699d 100644 --- a/toolkit/mozapps/update/tests/Makefile.in +++ b/toolkit/mozapps/update/tests/Makefile.in @@ -70,10 +70,7 @@ MOZ_GLUE_LDFLAGS = MOZ_WINCONSOLE = 1 ifeq ($(OS_ARCH),WINNT) -LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone) OS_LIBS += $(call EXPAND_LIBNAME,wintrust shlwapi) -else -LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common) endif endif # Not Android diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build index 24c928ead43..f1f5a2ed312 100644 --- a/toolkit/mozapps/update/tests/moz.build +++ b/toolkit/mozapps/update/tests/moz.build @@ -27,6 +27,15 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': '/toolkit/mozapps/update/common', ] + if CONFIG['OS_ARCH'] == 'WINNT': + USE_LIBS += [ + 'updatecommon-standalone', + ] + else: + USE_LIBS += [ + 'updatecommon', + ] + for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME', 'MOZ_APP_VENDOR', 'BIN_SUFFIX', 'MOZ_DEBUG'): DEFINES[var] = CONFIG[var] diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index d4c06b9a144..2a7cf6b5276 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -7,19 +7,13 @@ MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = -ifeq ($(OS_ARCH),WINNT) -LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone) -else -LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common) -endif - +ifdef MOZ_NATIVE_BZ2 LIBS += \ - $(call EXPAND_LIBNAME_PATH,mar,$(DEPTH)/modules/libmar/src) \ $(MOZ_BZ2_LIBS) \ $(NULL) +endif ifeq ($(OS_ARCH),WINNT) -LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi) endif diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index ba1c0881a8e..1b3b05b3dc1 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -30,6 +30,23 @@ if CONFIG['OS_ARCH'] == 'WINNT': LOCAL_INCLUDES += [ '/toolkit/xre', ] + USE_LIBS += [ + 'updatecommon-standalone', + 'verifymar', + ] +else: + USE_LIBS += [ + 'updatecommon', + ] + +USE_LIBS += [ + 'mar', +] + +if not CONFIG['MOZ_NATIVE_BZ2']: + USE_LIBS += [ + 'bz2', + ] if CONFIG['MOZ_ENABLE_GTK']: have_progressui = 1 diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in index 266359d072d..47e75a7db16 100644 --- a/toolkit/system/dbus/Makefile.in +++ b/toolkit/system/dbus/Makefile.in @@ -2,8 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_DSO_LDOPTS = \ - $(XPCOM_GLUE_LDOPTS) \ +EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(MOZ_DBUS_GLIB_LIBS) \ $(NULL) diff --git a/toolkit/system/dbus/moz.build b/toolkit/system/dbus/moz.build index e9870f44144..3910ae603f5 100644 --- a/toolkit/system/dbus/moz.build +++ b/toolkit/system/dbus/moz.build @@ -13,3 +13,9 @@ SOURCES += [ LIBRARY_NAME = 'dbusservice' IS_COMPONENT = True + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in index 7696d3f5eb6..b35bbcf8466 100644 --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -3,8 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. EXTRA_DSO_LDOPTS += \ - $(XPCOM_GLUE_LDOPTS) \ - $(XPCOM_FROZEN_LDOPTS) \ $(NSPR_LIBS) \ $(MOZ_GCONF_LIBS) \ $(MOZ_GNOMEVFS_LIBS) \ diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build index 4471cdc3732..44f1cc5cec5 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -33,3 +33,8 @@ LOCAL_INCLUDES += [ '/toolkit/components/build/', ] +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index 96d0ce8faab..f26827ab397 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -24,14 +24,9 @@ include $(topsrcdir)/config/config.mk LIBS += \ tmreader.$(OBJ_SUFFIX) \ adreader.$(OBJ_SUFFIX) \ - $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -LIBS += $(DIST)/bin/XUL -endif - ifdef HAVE_BOUTELL_GD ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += \ diff --git a/tools/trace-malloc/moz.build b/tools/trace-malloc/moz.build index a929e57ac60..5c5c64ca2c9 100644 --- a/tools/trace-malloc/moz.build +++ b/tools/trace-malloc/moz.build @@ -43,3 +43,9 @@ SIMPLE_PROGRAMS += simple_cpp_sources RESOURCE_FILES += [ 'spacetrace.css' ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/webapprt/gtk/Makefile.in b/webapprt/gtk/Makefile.in index 50a72b5f28a..e934fee2836 100644 --- a/webapprt/gtk/Makefile.in +++ b/webapprt/gtk/Makefile.in @@ -2,8 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ +LIBS += \ $(TK_LIBS) \ $(NULL) diff --git a/webapprt/gtk/moz.build b/webapprt/gtk/moz.build index 18fb764754e..31b58ee733c 100644 --- a/webapprt/gtk/moz.build +++ b/webapprt/gtk/moz.build @@ -21,4 +21,8 @@ LOCAL_INCLUDES += [ '/xpcom/build', ] +USE_LIBS += [ + 'xpcomglue', +] + DISABLE_STL_WRAPPING = True diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in index 18b6f8d9fc4..e0a09fffd95 100644 --- a/webapprt/mac/Makefile.in +++ b/webapprt/mac/Makefile.in @@ -11,10 +11,6 @@ NSDISTMODE = copy MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = -LIBS = \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - PROGRAMS_DEST = $(DIST)/bin include $(topsrcdir)/config/rules.mk diff --git a/webapprt/mac/moz.build b/webapprt/mac/moz.build index 4327892c833..f91b9db48d2 100644 --- a/webapprt/mac/moz.build +++ b/webapprt/mac/moz.build @@ -19,4 +19,8 @@ LOCAL_INCLUDES += [ '/xpcom/build', ] +USE_LIBS += [ + 'xpcomglue', +] + DISABLE_STL_WRAPPING = True diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in index 5b246197c96..29c7781b6f2 100644 --- a/webapprt/win/Makefile.in +++ b/webapprt/win/Makefile.in @@ -6,10 +6,6 @@ # to dynamically link into our executable, as we copy it to arbitrary locations. MOZ_GLUE_LDFLAGS = -LIBS = \ - $(XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS) \ - $(NULL) - ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG MOZ_WINCONSOLE = 1 diff --git a/webapprt/win/moz.build b/webapprt/win/moz.build index fdbc1fb70ae..d22b00f86d4 100644 --- a/webapprt/win/moz.build +++ b/webapprt/win/moz.build @@ -42,4 +42,8 @@ if not CONFIG['GNU_CC']: RCINCLUDE = 'webapprt.rc' +USE_LIBS += [ + 'xpcomglue_staticruntime', +] + DISABLE_STL_WRAPPING = True diff --git a/widget/tests/moz.build b/widget/tests/moz.build index 1b789ce854c..8317eeaf9dd 100644 --- a/widget/tests/moz.build +++ b/widget/tests/moz.build @@ -25,3 +25,9 @@ FAIL_ON_WARNINGS = True # CPP_UNIT_TESTS += ['TestChromeMargin'] SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/widget/xremoteclient/Makefile.in b/widget/xremoteclient/Makefile.in index 1076b5c3b38..bb4b016129d 100644 --- a/widget/xremoteclient/Makefile.in +++ b/widget/xremoteclient/Makefile.in @@ -11,11 +11,6 @@ LIBCPPSRCS = XRemoteClient.cpp OBJS = $(LIBCPPSRCS:.cpp=.$(OBJ_SUFFIX)) -EXTRA_DSO_LDOPTS = \ - $(XLIBS) $(XLDFLAGS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - PROGCPPSRCS = \ mozilla-xremote-client.cpp \ XRemoteClient.cpp \ diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in index 1860e72f6f6..b30688ed52c 100644 --- a/xpcom/reflect/xptcall/tests/Makefile.in +++ b/xpcom/reflect/xptcall/tests/Makefile.in @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(XPCOM_GLUE_LDOPTS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/reflect/xptcall/tests/moz.build b/xpcom/reflect/xptcall/tests/moz.build index 1dcd31fd0d5..b1860a9887a 100644 --- a/xpcom/reflect/xptcall/tests/moz.build +++ b/xpcom/reflect/xptcall/tests/moz.build @@ -11,3 +11,9 @@ SIMPLE_PROGRAMS = [ SOURCES += [ '%s.cpp' % s for s in SIMPLE_PROGRAMS ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in index 1860e72f6f6..b30688ed52c 100644 --- a/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/xpcom/reflect/xptinfo/tests/Makefile.in @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(XPCOM_GLUE_LDOPTS) \ +LIBS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/reflect/xptinfo/tests/moz.build b/xpcom/reflect/xptinfo/tests/moz.build index 71dfdb1ca85..dc214015c4c 100644 --- a/xpcom/reflect/xptinfo/tests/moz.build +++ b/xpcom/reflect/xptinfo/tests/moz.build @@ -11,3 +11,9 @@ SOURCES += [ SIMPLE_PROGRAMS += [ 'TestInterfaceInfo' ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in index 96ff3918990..cec9f6f80a6 100644 --- a/xpcom/sample/Makefile.in +++ b/xpcom/sample/Makefile.in @@ -6,9 +6,7 @@ # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library # from this Makefile. We link against the "dependent glue" and against the # frozen XPCOM shared library. -EXTRA_DSO_LDOPTS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_FROZEN_LDOPTS) \ +EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/sample/moz.build b/xpcom/sample/moz.build index 09ae7251de7..7b20a256962 100644 --- a/xpcom/sample/moz.build +++ b/xpcom/sample/moz.build @@ -39,3 +39,9 @@ IS_COMPONENT = True RESOURCE_FILES.samples += [ 'xpconnect-sample.html', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/sample/program/Makefile.in b/xpcom/sample/program/Makefile.in index 1b8e98f121e..e2f670106de 100644 --- a/xpcom/sample/program/Makefile.in +++ b/xpcom/sample/program/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# LIBS specifies linker flags when building an executable program from -# this Makefile. We link against the "standalone glue" which does not require -# that the application be linked against the XPCOM dynamic library or the NSPR -# dynamic libraries. -LIBS = \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - # Need to link with CoreFoundation on Mac ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ diff --git a/xpcom/sample/program/moz.build b/xpcom/sample/program/moz.build index 8c32a937832..6de22398966 100644 --- a/xpcom/sample/program/moz.build +++ b/xpcom/sample/program/moz.build @@ -18,3 +18,11 @@ SIMPLE_PROGRAMS += [ # Whatever code is going to be linked with the *standalone* glue must be # built with the XPCOM_GLUE define set. DEFINES['XPCOM_GLUE'] = True + +# USE_LIBS specifies the in-tree libraries to link when building an executable +# program from this directory. We link against the "standalone glue" which does +# not require# that the application be linked against the XPCOM dynamic library +# or the NSPR dynamic libraries. +USE_LIBS += [ + 'xpcomglue', +] diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 9ccb1419879..f4905a4dedb 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -2,8 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS += $(XPCOM_LIBS) - # Make sure we have symbols in case we need to debug these. MOZ_DEBUG_SYMBOLS = 1 diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in index fbd8c264150..ee3c9ae8acf 100644 --- a/xpcom/tests/bug656331_component/Makefile.in +++ b/xpcom/tests/bug656331_component/Makefile.in @@ -11,9 +11,7 @@ MANIFEST = bug656331.manifest MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation) PP_TARGETS += MANIFEST -EXTRA_DSO_LDOPTS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_FROZEN_LDOPTS) \ +EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/tests/bug656331_component/moz.build b/xpcom/tests/bug656331_component/moz.build index 5beb453834d..82233b80487 100644 --- a/xpcom/tests/bug656331_component/moz.build +++ b/xpcom/tests/bug656331_component/moz.build @@ -19,3 +19,9 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % ( LIBRARY_NAME, CONFIG['DLL_SUFFIX'] ) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in index 710b030ed58..2a3ca93a7ae 100644 --- a/xpcom/tests/component/Makefile.in +++ b/xpcom/tests/component/Makefile.in @@ -9,9 +9,7 @@ MANIFEST = testcomponent.manifest MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation) PP_TARGETS += MANIFEST -EXTRA_DSO_LDOPTS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_FROZEN_LDOPTS) \ +EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/tests/component/moz.build b/xpcom/tests/component/moz.build index 544f0a7fadf..21daf6a7d64 100644 --- a/xpcom/tests/component/moz.build +++ b/xpcom/tests/component/moz.build @@ -19,3 +19,9 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % ( LIBRARY_NAME, CONFIG['DLL_SUFFIX'] ) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in index 33c2c3eed28..a023bebe33e 100644 --- a/xpcom/tests/component_no_aslr/Makefile.in +++ b/xpcom/tests/component_no_aslr/Makefile.in @@ -10,8 +10,6 @@ MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation) PP_TARGETS += MANIFEST EXTRA_DSO_LDOPTS = \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_FROZEN_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/tests/component_no_aslr/moz.build b/xpcom/tests/component_no_aslr/moz.build index c2cdb6f546a..9545d36670b 100644 --- a/xpcom/tests/component_no_aslr/moz.build +++ b/xpcom/tests/component_no_aslr/moz.build @@ -19,3 +19,9 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % ( LIBRARY_NAME, CONFIG['DLL_SUFFIX'] ) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in index 5002019438c..09bab295a69 100644 --- a/xpcom/tests/external/Makefile.in +++ b/xpcom/tests/external/Makefile.in @@ -5,6 +5,5 @@ include $(topsrcdir)/config/rules.mk LIBS += \ - $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/tests/external/moz.build b/xpcom/tests/external/moz.build index 75fc790f83f..c7a30e476a2 100644 --- a/xpcom/tests/external/moz.build +++ b/xpcom/tests/external/moz.build @@ -11,3 +11,9 @@ SIMPLE_PROGRAMS = [ SOURCES += [ '%s.cpp' % s for s in SIMPLE_PROGRAMS ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build index 74f05fd142d..5f9345de310 100644 --- a/xpcom/tests/moz.build +++ b/xpcom/tests/moz.build @@ -123,3 +123,9 @@ LOCAL_INCLUDES += [ RESOURCE_FILES += [ 'test.properties', ] + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/tests/windows/moz.build b/xpcom/tests/windows/moz.build index 51d3597e318..ce99853b5d2 100644 --- a/xpcom/tests/windows/moz.build +++ b/xpcom/tests/windows/moz.build @@ -10,3 +10,9 @@ CPP_UNIT_TESTS += [ ] SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS) + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in index be912cab763..9f96074de9a 100644 --- a/xpcom/typelib/xpt/tests/Makefile.in +++ b/xpcom/typelib/xpt/tests/Makefile.in @@ -3,11 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_LIBXUL diff --git a/xpcom/typelib/xpt/tests/moz.build b/xpcom/typelib/xpt/tests/moz.build index 7d725e5ebc1..c04b145085f 100644 --- a/xpcom/typelib/xpt/tests/moz.build +++ b/xpcom/typelib/xpt/tests/moz.build @@ -14,3 +14,9 @@ SOURCES += [ ] FAIL_ON_WARNINGS = True + +USE_LIBS += [ + 'mozalloc', + 'xpt', + 'xul-shared', +] diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index 5a3ffae5ac1..f3eeb00c5fc 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -12,10 +12,6 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) TK_LIBS := -framework Cocoa $(TK_LIBS) endif -LIBS += \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG MOZ_WINCONSOLE = 1 diff --git a/xulrunner/app/moz.build b/xulrunner/app/moz.build index aaa8d209dd8..ebe44c582c6 100644 --- a/xulrunner/app/moz.build +++ b/xulrunner/app/moz.build @@ -43,4 +43,8 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: if CONFIG['OS_ARCH'] == 'WINNT': RCINCLUDE = 'splash.rc' +USE_LIBS += [ + 'xpcomglue', +] + DISABLE_STL_WRAPPING = True diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in index de4f42b68e3..b18d4f49de0 100644 --- a/xulrunner/examples/simple/components/src/Makefile.in +++ b/xulrunner/examples/simple/components/src/Makefile.in @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_DSO_LDOPTS = \ - $(XPCOM_GLUE_LDOPTS) \ +EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(NULL) diff --git a/xulrunner/examples/simple/components/src/moz.build b/xulrunner/examples/simple/components/src/moz.build index 0957823ce0f..791926db4ee 100644 --- a/xulrunner/examples/simple/components/src/moz.build +++ b/xulrunner/examples/simple/components/src/moz.build @@ -18,3 +18,9 @@ EXTRA_COMPONENTS += [ IS_COMPONENT = True XPI_NAME = 'simple' + +USE_LIBS += [ + 'mozalloc', + 'xpcomglue_s', + 'xul-shared', +] diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in index 89437002df5..925a7440b5e 100644 --- a/xulrunner/stub/Makefile.in +++ b/xulrunner/stub/Makefile.in @@ -5,10 +5,6 @@ # Don't create a dependency on mozglue MOZ_GLUE_LDFLAGS = -LIBS = \ - $(XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS) \ - $(NULL) - # Need to link with CoreFoundation on Mac ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ diff --git a/xulrunner/stub/moz.build b/xulrunner/stub/moz.build index 52334d3ca69..6291b746502 100644 --- a/xulrunner/stub/moz.build +++ b/xulrunner/stub/moz.build @@ -38,4 +38,13 @@ if CONFIG['OS_ARCH'] == 'WINNT': DEFINES['MOZ_XULRUNNER'] = True RCINCLUDE = 'xulrunner-stub.rc' +if CONFIG['OS_ARCH'] == 'WINNT': + USE_LIBS += [ + 'xpcomglue_staticruntime', + ] +else: + USE_LIBS += [ + 'xpcomglue', + ] + DISABLE_STL_WRAPPING = True diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in index fd7b5a8fbd4..31c253be806 100644 --- a/xulrunner/tools/redit/Makefile.in +++ b/xulrunner/tools/redit/Makefile.in @@ -8,8 +8,4 @@ SDK_BINARY = \ $(PROGRAM) \ $(NULL) -LIBS = \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - endif diff --git a/xulrunner/tools/redit/moz.build b/xulrunner/tools/redit/moz.build index 4b1ad889a07..00fe698fa69 100644 --- a/xulrunner/tools/redit/moz.build +++ b/xulrunner/tools/redit/moz.build @@ -13,3 +13,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': DEFINES[var] = True if CONFIG['GNU_CC']: WIN32_EXE_LDFLAGS += ['-municode'] + + USE_LIBS += [ + 'xpcomglue', + ]