b=882906; remove EXTRA_DSO_LIBS; r=ted
authorVladimir Vukicevic <vladimir@pobox.com>
Thu, 13 Jun 2013 22:58:22 -0400
changeset 146602 14d1a41e212918f875d299a48b83fa2cc200ca4a
parent 146601 814d183f9b002bbcab114b9c0f814f309fcbec34
child 146603 d1fc221d10a0bf57fee15389164aed7d0519b5fe
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs882906
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=882906; remove EXTRA_DSO_LIBS; r=ted
b2g/app/Makefile.in
browser/app/Makefile.in
config/makefiles/debugmake.mk
config/rules.mk
js/src/config/makefiles/debugmake.mk
js/src/config/rules.mk
media/mtransport/test/Makefile.in
media/webrtc/signaling/test/Makefile.in
mobile/android/app/Makefile.in
netwerk/test/Makefile.in
startupcache/test/Makefile.in
toolkit/crashreporter/test/Makefile.in
toolkit/library/Makefile.in
tools/trace-malloc/Makefile.in
xulrunner/app/Makefile.in
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -46,17 +46,16 @@ LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/b
 LOCAL_INCLUDES += -I$(DEPTH)/build
 
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += $(JEMALLOC_LIBS)
 
 LIBS += \
-  $(EXTRA_DSO_LIBS) \
   $(XPCOM_STANDALONE_GLUE_LDOPTS) \
   $(NULL)
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 LIBS += \
   -lbinder \
   -lutils \
   $(NULL)
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -49,17 +49,16 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/xpcom/build \
   -I$(DEPTH)/build \
   $(NULL)
 
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += \
-	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 
 ifdef MOZ_LINKER
 LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
 ifdef HAVE_CLOCK_MONOTONIC
--- a/config/makefiles/debugmake.mk
+++ b/config/makefiles/debugmake.mk
@@ -45,17 +45,16 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGR
 	@echo "LIBRARY             = $(LIBRARY)"
 	@echo "SHARED_LIBRARY      = $(SHARED_LIBRARY)"
 	@echo "SHARED_LIBRARY_LIBS = $(SHARED_LIBRARY_LIBS)"
 	@echo "LIBS                = $(LIBS)"
 	@echo "DEF_FILE            = $(DEF_FILE)"
 	@echo "IMPORT_LIBRARY      = $(IMPORT_LIBRARY)"
 	@echo "STATIC_LIBS         = $(STATIC_LIBS)"
 	@echo "SHARED_LIBS         = $(SHARED_LIBS)"
-	@echo "EXTRA_DSO_LIBS      = $(EXTRA_DSO_LIBS)"
 	@echo "EXTRA_DSO_LDOPTS    = $(EXTRA_DSO_LDOPTS)"
 	@echo "DEPENDENT_LIBS      = $(DEPENDENT_LIBS)"
 	@echo --------------------------------------------------------------------------------
 endif
 	$(LOOP_OVER_PARALLEL_DIRS)
 	$(LOOP_OVER_DIRS)
 
 showbuild:
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -105,20 +105,16 @@ else
   ELOG :=
 endif # -s
 else
   ELOG :=
 endif # ifndef .PYMAKE
 
 _VPATH_SRCS = $(abspath $<)
 
-ifdef EXTRA_DSO_LIBS
-EXTRA_DSO_LIBS	:= $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
-endif
-
 ################################################################################
 # Testing frameworks support
 ################################################################################
 
 testxpcobjdir = $(DEPTH)/_tests/xpcshell
 
 ifdef ENABLE_TESTS
 
--- a/js/src/config/makefiles/debugmake.mk
+++ b/js/src/config/makefiles/debugmake.mk
@@ -45,17 +45,16 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGR
 	@echo "LIBRARY             = $(LIBRARY)"
 	@echo "SHARED_LIBRARY      = $(SHARED_LIBRARY)"
 	@echo "SHARED_LIBRARY_LIBS = $(SHARED_LIBRARY_LIBS)"
 	@echo "LIBS                = $(LIBS)"
 	@echo "DEF_FILE            = $(DEF_FILE)"
 	@echo "IMPORT_LIBRARY      = $(IMPORT_LIBRARY)"
 	@echo "STATIC_LIBS         = $(STATIC_LIBS)"
 	@echo "SHARED_LIBS         = $(SHARED_LIBS)"
-	@echo "EXTRA_DSO_LIBS      = $(EXTRA_DSO_LIBS)"
 	@echo "EXTRA_DSO_LDOPTS    = $(EXTRA_DSO_LDOPTS)"
 	@echo "DEPENDENT_LIBS      = $(DEPENDENT_LIBS)"
 	@echo --------------------------------------------------------------------------------
 endif
 	$(LOOP_OVER_PARALLEL_DIRS)
 	$(LOOP_OVER_DIRS)
 
 showbuild:
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -105,20 +105,16 @@ else
   ELOG :=
 endif # -s
 else
   ELOG :=
 endif # ifndef .PYMAKE
 
 _VPATH_SRCS = $(abspath $<)
 
-ifdef EXTRA_DSO_LIBS
-EXTRA_DSO_LIBS	:= $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
-endif
-
 ################################################################################
 # Testing frameworks support
 ################################################################################
 
 testxpcobjdir = $(DEPTH)/_tests/xpcshell
 
 ifdef ENABLE_TESTS
 
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@@ -13,17 +13,17 @@ FAIL_ON_WARNINGS = 1
 
 DEFINES += \
   -DHAVE_STRDUP -DNR_SOCKET_IS_VOID_PTR -DSCTP_DEBUG -DINET
 
 ifneq ($(OS_TARGET),Android)
 DEFINES += -DINET6
 endif
 
-LIBS = $(EXTRA_DSO_LIBS) \
+LIBS = \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
   $(NSS_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)
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBS = \
-  $(EXTRA_DSO_LIBS) \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
   $(NSS_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) \
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@@ -21,17 +21,16 @@ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(DEPTH)/build
 
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += \
-  $(EXTRA_DSO_LIBS) \
   $(XPCOM_STANDALONE_GLUE_LDOPTS) \
   $(NULL)
 
 endif
 endif #LIBXUL_SDK
 
 # Make sure the standalone glue doesn't try to get libxpcom.so from mobile/app.
 NSDISTMODE = copy
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -48,18 +48,17 @@ DISABLED_SIMPLE_PROGRAMS := $(cppsrcs:.c
 
 CPP_UNIT_TESTS = \
 		 TestSTSParser.cpp \
 		 TestUDPServerSocket.cpp \
 		 $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
-LIBS		= $(EXTRA_DSO_LIBS) \
-		  $(XPCOM_LIBS) \
+LIBS		= $(XPCOM_LIBS) \
 		  $(NSPR_LIBS) \
 		  $(NULL)
 
 DEFINES += $(TK_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
 check::
--- a/startupcache/test/Makefile.in
+++ b/startupcache/test/Makefile.in
@@ -7,12 +7,11 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 CPP_UNIT_TESTS = TestStartupCache.cpp
 
-EXTRA_DSO_LIBS += xul
 LIBS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -21,17 +21,16 @@ VPATH += \
   $(srcdir)/../google-breakpad/src/common/ \
   $(topsrcdir)/build/ \
   $(NULL)
 
 LOCAL_INCLUDES += \
   -I$(XPIDL_GEN_DIR) \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
-EXTRA_DSO_LIBS += xpcom
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
 
 EXTRA_JS_MODULES = CrashTestUtils.jsm
 
 MOCHITEST_BROWSER_FILES = \
   browser/head.js \
   browser/crashreport.sjs \
   browser/browser_aboutCrashes.js \
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -490,17 +490,17 @@ ifeq ($(OS_ARCH),WINNT)
 IS_32BIT_HOST := $(if $(filter AMD64,$(PROCESSOR_ARCHITECTURE) $(PROCESSOR_ARCHITEW6432)),,yes)
 ifneq (,$(or $(filter 1400,$(_MSC_VER)),$(IS_32BIT_HOST)))
 ifdef MOZ_DEBUG
 EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
 endif
 endif
 endif
 
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+EXTRA_DSO_LDOPTS += $(LIBS_DIR)
 
 DEFINES += -DIMPL_XREAPI
 
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CXXFLAGS += $(TK_CFLAGS)
 OS_LIBS += \
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -42,26 +42,21 @@ endif
 
 CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS)
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -I$(topsrcdir)/config/os2
 endif
 
 include $(topsrcdir)/config/config.mk
 
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LIBS	= xul
-endif
-
 LIBS		+= \
 		$(LIBS_DIR) \
 		tmreader.$(OBJ_SUFFIX) \
 		adreader.$(OBJ_SUFFIX) \
 		$(XPCOM_GLUE_LDOPTS) \
-		$(EXTRA_DSO_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LIBS += $(DIST)/bin/XUL
 endif
 
 ifdef HAVE_BOUTELL_GD
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -31,17 +31,16 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/xpcom/build \
   $(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 endif
 
 LIBS += \
-  $(EXTRA_DSO_LIBS) \
   $(XPCOM_STANDALONE_GLUE_LDOPTS) \
   $(NULL)
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0