b=882906; remove EXTRA_DSO_LIBS; r=ted

This commit is contained in:
Vladimir Vukicevic 2013-06-13 22:58:22 -04:00
parent 989334160e
commit 9e17b8825a
15 changed files with 3 additions and 26 deletions

View File

@ -51,7 +51,6 @@ STL_FLAGS=
LIBS += $(JEMALLOC_LIBS)
LIBS += \
$(EXTRA_DSO_LIBS) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
$(NULL)

View File

@ -54,7 +54,6 @@ DEFINES += -DXPCOM_GLUE
STL_FLAGS=
LIBS += \
$(EXTRA_DSO_LIBS) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
$(NULL)

View File

@ -50,7 +50,6 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $
@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 --------------------------------------------------------------------------------

View File

@ -110,10 +110,6 @@ endif # ifndef .PYMAKE
_VPATH_SRCS = $(abspath $<)
ifdef EXTRA_DSO_LIBS
EXTRA_DSO_LIBS := $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
endif
################################################################################
# Testing frameworks support
################################################################################

View File

@ -50,7 +50,6 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $
@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 --------------------------------------------------------------------------------

View File

@ -110,10 +110,6 @@ endif # ifndef .PYMAKE
_VPATH_SRCS = $(abspath $<)
ifdef EXTRA_DSO_LIBS
EXTRA_DSO_LIBS := $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
endif
################################################################################
# Testing frameworks support
################################################################################

View File

@ -18,7 +18,7 @@ ifneq ($(OS_TARGET),Android)
DEFINES += -DINET6
endif
LIBS = $(EXTRA_DSO_LIBS) \
LIBS = \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NSS_LIBS) \

View File

@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBS = \
$(EXTRA_DSO_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NSS_LIBS) \

View File

@ -26,7 +26,6 @@ DEFINES += -DXPCOM_GLUE
STL_FLAGS=
LIBS += \
$(EXTRA_DSO_LIBS) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
$(NULL)

View File

@ -53,8 +53,7 @@ CPP_UNIT_TESTS = \
include $(topsrcdir)/config/config.mk
LIBS = $(EXTRA_DSO_LIBS) \
$(XPCOM_LIBS) \
LIBS = $(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

View File

@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
CPP_UNIT_TESTS = TestStartupCache.cpp
EXTRA_DSO_LIBS += xul
LIBS += $(MOZ_COMPONENT_LIBS)
include $(topsrcdir)/config/rules.mk

View File

@ -26,7 +26,6 @@ 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

View File

@ -495,7 +495,7 @@ endif
endif
endif
EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
DEFINES += -DIMPL_XREAPI

View File

@ -47,16 +47,11 @@ 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)

View File

@ -36,7 +36,6 @@ TK_LIBS := -framework Cocoa $(TK_LIBS)
endif
LIBS += \
$(EXTRA_DSO_LIBS) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
$(NULL)