Bug 659621 - Remove EXTRA_DSO_LIBS, EXTRA_DSO_LDOPTS, OS_LIBS from makefiles containing LIBXUL_LIBRARY = 1, now that libxul is always built; r=ted

2011-06-12 03:49:00 -04:00 · 2011-06-12 03:49:00 -04:00 · 13cfc322c6
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@ -71,29 +71,5 @@ ifndef DISABLE_XFORMS_HOOKS
 SHARED_LIBRARY_LIBS += ../src/xforms/$(LIB_PREFIX)accessibility_xforms_s.$(LIB_SUFFIX)
 endif

-EXTRA_DSO_LIBS = \
-	gkgfx \
-	thebes \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS =           \
-	$(LIBS_DIR)              \
-	$(EXTRA_DSO_LIBS)        \
-	$(MOZ_UNICHARUTIL_LIBS)  \
-	$(MOZ_COMPONENT_LIBS)    \
-	$(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += \
-	oleaut32.lib \
-	version.lib \
-	ole32.lib \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@ -88,8 +88,6 @@ EXPORTS = \
 # we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1

-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-
 include $(topsrcdir)/config/rules.mk

 CFLAGS		+= $(MOZ_GTK2_CFLAGS)
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@ -61,19 +61,6 @@ CPPSRCS		= \
 		nsChromeRegistryContent.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-                $(MOZ_UNICHARUTIL_LIBS) \
-                $(MOZ_COMPONENT_LIBS) \
-                $(NULL)
-
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/config/config.mk
+++ b/config/config.mk
@ -557,10 +557,6 @@ else
 ELF_DYNSTR_GC	= :
 endif

-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-OS_LIBS += $(MOZ_QT_LIBS)
-endif
-
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 ifdef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@ -59,10 +59,5 @@ EXPORTS		= \

 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@ -69,14 +69,6 @@ SHARED_LIBRARY_LIBS= \
 		../shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
 		$(NULL)

-EXTRA_DSO_LDOPTS= \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
@ -90,23 +82,4 @@ LOCAL_INCLUDES	= \

 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LOCAL_INCLUDES += -I$(topsrcdir)/uriloader/exthandler/mac
-EXTRA_DSO_LDOPTS += \
-        $(TK_LIBS) \
-        $(NULL)
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS		+= $(call EXPAND_LIBNAME, shell32 ole32)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-EXTRA_DSO_LDOPTS	+= $(TK_LIBS)
-endif
-
-ifdef MOZ_ENABLE_DBUS
- EXTRA_DSO_LDOPTS += $(MOZ_DBUS_LIBS)
-endif
-
-ifdef MOZ_PLATFORM_MAEMO
-EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 endif
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@ -54,10 +54,6 @@ CPPSRCS		= nsSHEntry.cpp        \
            nsSHistory.cpp \
            $(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += -I$(srcdir)/../../base
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@ -132,42 +132,12 @@ LOCAL_INCLUDES = \
  $(MOZ_CAIRO_CFLAGS) \
  $(NULL)

-ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
-EXTRA_DSO_LIBS	+= gkgfx
-endif
-
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_NECKO_UTIL_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS		+= $(call EXPAND_LIBNAME,version)
-endif
-
 CXXFLAGS         += $(TK_CFLAGS)
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-
-ifdef MOZ_ENABLE_GTK2
-EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS)
-endif           #MOZ_ENABLE_GTK2
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-EXTRA_DSO_LDOPTS += $(XEXT_LIBS) $(XCOMPOSITE_LIBS)
-endif

 $(DIST)/bin/plugins:
 	$(NSINSTALL) -D $@
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@ -54,10 +54,6 @@ CPPSRCS		= \
 		nsGeoPosition.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@ -63,11 +63,6 @@ LOCAL_INCLUDES += \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
 ifdef BUILD_DEBUG_GC
 DEFINES		+= -DDEBUG_GC
 endif
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@ -52,10 +52,6 @@ CPPSRCS		= \
 		nsDesktopNotification.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -61,10 +61,6 @@ CPPSRCS  = \
           nsEditorSpellCheck.cpp         \
           $(NULL)

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS)
-
 include $(topsrcdir)/config/rules.mk

 INCLUDES        += -I../../libeditor/base/src
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@ -58,9 +58,5 @@ CPPSRCS		= \
 		nsTransactionStack.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -54,11 +54,5 @@ CPPSRCS		= \
 		nsTextServicesDocument.cpp \
 		$(NULL)

-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@ -52,8 +52,6 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1


-EXTRA_DSO_LIBS	= gkgfx thebes
-
 CPPSRCS		= \
 		nsWebBrowserModule.cpp		\
 		$(NULL)
@ -62,17 +60,6 @@ SHARED_LIBRARY_LIBS= \
 		../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
 		$(NULL)

-EXTRA_DSO_LDOPTS= \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= \
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@ -86,27 +86,10 @@ endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win 
-OS_LIBS	+= $(call EXPAND_LIBNAME,winspool comdlg32)
 endif

 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
 endif

-EXTRA_DSO_LIBS = gkgfx
-
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_JS_LIBS) \
-	$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
-        $(TK_LIBS) \
-        $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@ -55,11 +55,6 @@ CPPSRCS		= \
      nsPrintDialogUtil.cpp \
      $(NULL)

-OS_LIBS	+= \
-	comdlg32.lib \
-	winspool.lib \
-	$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@ -58,15 +58,9 @@ LIBXUL_LIBRARY = 1
 CPPSRCS		= \
 		nsAuthFactory.cpp \
 		nsHttpNegotiateAuth.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-CPPSRCS		+= \
 		nsAuthGSSAPI.cpp \
-		nsAuthSASL.cpp
+		nsAuthSASL.cpp \
+		$(NULL)

 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -DUSE_SSPI
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -65,10 +65,6 @@ XPIDLSRCS	= \
 		nsICookiePromptService.idl \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 ifdef MOZ_MAIL_NEWS
 DEFINES += -DMOZ_MAIL_NEWS
 endif
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@ -55,8 +55,4 @@ CPPSRCS		= \
 		  nsContentBlocker.cpp \
 		  $(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@ -65,13 +65,6 @@ DEFINES          += -DMOZ_LDAP_XPCOM
 CPPSRCS          += nsLDAPSyncQuery.cpp
 endif

-
-EXTRA_DSO_LDOPTS = \
-                   $(LIBS_DIR) \
-                   $(MOZ_JS_LIBS) \
-                   $(MOZ_COMPONENT_LIBS) \
-                   $(NULL)
-
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@ -55,11 +55,6 @@ ifdef MOZ_ENABLE_GTK2
 DIRS		= gconf
 endif

-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 CPPSRCS =   \
  nsSystemPref.cpp	   \
  $(NULL)
--- a/extensions/pref/system-pref/src/gconf/Makefile.in
+++ b/extensions/pref/system-pref/src/gconf/Makefile.in
@ -54,12 +54,6 @@ CPPSRCS =   \

 SHARED_LIBRARY_LIBS = ../libsystem-pref_s.a

-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_GTK2_LIBS) \
-		$(NULL)
-
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME	= nsSystemPrefModule
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@ -67,14 +67,6 @@ CPPSRCS         += affentry.cpp \
 DEFINES = -DHUNSPELL_STATIC
 endif

-EXTRA_DSO_LDOPTS = \
-                   $(LIBS_DIR) \
-                   $(XPCOM_LIBS) \
-                   $(NSPR_LIBS) \
-                   $(MOZ_UNICHARUTIL_LIBS) \
-                   $(MOZ_HUNSPELL_LIBS) \
-                   $(NULL)
-
 include $(topsrcdir)/config/rules.mk

 ifdef MOZ_NATIVE_HUNSPELL
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@ -65,13 +65,6 @@ CPPSRCS		= \
 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_HUNSPELL_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += \
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@ -64,8 +64,4 @@ SHARED_LIBRARY_LIBS = \
 		../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
 		$(NULL)

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -138,7 +138,6 @@ endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS += nsSystemFontsWin.cpp
-OS_LIBS += $(call EXPAND_LIBNAME,usp10)
 endif

 include $(topsrcdir)/config/rules.mk
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@ -204,19 +204,6 @@ SHARED_LIBRARY_LIBS += \
 	$(NULL)


-EXTRA_DSO_LDOPTS += \
-	$(MOZ_CAIRO_LIBS) \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(XPCOM_LIBS) \
-	$(NSPR_LIBS) \
-	$(ZLIB_LIBS) \
-	$(QCMS_LIBS) \
-	$(MOZ_HARFBUZZ_LIBS) \
-	$(MOZ_OTS_LIBS) \
-	$(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS	+= 	gfxWindowsPlatform.cpp \
 		gfxWindowsSurface.cpp \
@ -231,9 +218,6 @@ CPPSRCS	+= gfxFT2Fonts.cpp \
 	   gfxFT2FontList.cpp \
 	   $(NULL)

-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
-
-OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
 else
 ifdef MOZ_ENABLE_DWRITE_FONT
 CPPSRCS	+= gfxDWriteFonts.cpp \
@ -249,16 +233,10 @@ CPPSRCS	+= gfxGDIFont.cpp \
 	   gfxGDIShaper.cpp \
 	   gfxUniscribeShaper.cpp \
 	   $(NULL)
-_OS_LIBS = usp10 msimg32 ole32 version advapi32 shlwapi shell32
 endif

 CPPSRCS +=	gfxPDFSurface.cpp

-ifdef GNU_CXX
-_OS_LIBS	+= uuid
-endif
-OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
-
 ifdef MOZ_ENABLE_D3D9_LAYER
 DEFINES +=	-DMOZ_ENABLE_D3D9_LAYER
 endif
@ -318,7 +296,6 @@ ifdef MOZ_DFB
 CSRCS = cairo-gdk-utils.c
 endif

-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
 endif

 ifdef MOZ_DFB
@ -338,7 +315,6 @@ CPPSRCS +=	gfxFT2Utils.cpp
 CPPSRCS +=	gfxFontconfigUtils.cpp
 CPPSRCS +=	nsUnicodeRange.cpp
 CPPSRCS +=	gfxPDFSurface.cpp
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS) $(XEXT_LIBS)
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
@ -359,14 +335,10 @@ CMMSRCS = \
 	nsCoreAnimationSupport.mm \
 	$(NULL)

-# Always link with OpenGL/AGL
-EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit -framework QuartzCore
 endif

 CSRCS += woff.c

-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-
 GL_PROVIDER = Null

 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@ -95,11 +95,4 @@ ASFILES = yuv_row_arm.$(ASM_SUFFIX) \
 endif
 endif

-EXTRA_DSO_LDOPTS += \
-        $(LIBS_DIR) \
-        $(EXTRA_DSO_LIBS) \
-        $(XPCOM_LIBS) \
-        $(NSPR_LIBS) \
-        $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@ -82,25 +82,4 @@ SHARED_LIBRARY_LIBS = \
 			../hyphenation/src/$(HYPHENATION_DIR)/$(LIB_PREFIX)hyphenation_s.$(LIB_SUFFIX) \
 			$(NULL)

-EXTRA_DSO_LDOPTS = \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
-        $(TK_LIBS) \
-        $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_PANGO_LIBS) \
-		$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-OS_LIBS += $(call EXPAND_LIBNAME,usp10)
-endif
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@ -59,9 +59,4 @@ CPPSRCS		= \
 		nsChardetModule.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -86,19 +86,6 @@ nsUTF8ToUnicodeSSE2.$(OBJ_SUFFIX): OS_CXXFLAGS += -xarch=sse2 -xO4
 endif
 endif

-EXTRA_DSO_LDOPTS = \
-		../util/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_NECKO_UTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-LOCAL_INCLUDES	= -I$(srcdir)/../util
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
 LOCAL_INCLUDES	= -I$(srcdir)/../util \
 		  -I$(srcdir)/../ucvlatin \
 		  -I$(srcdir)/../ucvibm \
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@ -66,8 +66,5 @@ EXPORTS		= \

 LOCAL_INCLUDES	= -I$(srcdir)/../util

-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@ -59,7 +59,5 @@ LOCAL_INCLUDES	= -I$(srcdir)/../util

 EXPORTS		= nsUCvTW2CID.h

-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 include $(topsrcdir)/config/rules.mk

--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@ -58,11 +58,6 @@ EXPORT_LIBRARY = 1

 # REQUIRES	= java js

-
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
 EXPORTS		= jsdebug.h

 ifdef JS_THREADSAFE
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@ -557,10 +557,6 @@ else
 ELF_DYNSTR_GC	= :
 endif

-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-OS_LIBS += $(MOZ_QT_LIBS)
-endif
-
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 ifdef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@ -123,11 +123,6 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		$(NULL)

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
 SHARED_LIBRARY_LIBS = \
  ../loader/$(LIB_PREFIX)jsloader_s.$(LIB_SUFFIX) \
  ../wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -58,8 +58,6 @@ MODULE_NAME	= nsLayoutModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1

-EXTRA_DSO_LIBS	+= thebes ycbcr
-

 CPPSRCS		= \
 		nsLayoutModule.cpp \
@ -242,47 +240,6 @@ endif
 SHARED_LIBRARY_LIBS += \
 	$(DEPTH)/js/src/xpconnect/src/$(LIB_PREFIX)xpconnect_s.$(LIB_SUFFIX)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-
-ifdef MOZ_ENABLE_GTK2
-EXTRA_DSO_LDOPTS += -lXrender
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-OS_LIBS += -framework OpenGL
-endif
-
-# Add explicit X11 dependency when building against X11 toolkits
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
-endif
-
-ifdef MOZ_SYDNEYAUDIO
-ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
-EXTRA_DSO_LDOPTS += -lossaudio
-endif
-
-ifeq ($(OS_ARCH),Linux)
-EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
-endif
-ifeq ($(OS_ARCH),Darwin)
-OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -framework IOKit
-endif
-endif
-
-ifdef MOZ_NATIVE_LIBVPX
-EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS)
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@ -67,12 +67,6 @@ CPPSRCS		= \
 		nsRegressionTester.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIRS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 libs::
--- a/mobile/components/build/Makefile.in
+++ b/mobile/components/build/Makefile.in
@ -69,20 +69,12 @@ CPPSRCS += nsPhoneSupport.cpp
 XPIDLSRCS = nsIPhoneSupport.idl
 endif

-EXTRA_DSO_LDOPTS += \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-
 ifeq ($(MOZ_PLATFORM_MAEMO),5)
 LOCAL_INCLUDES   += $(MOZ_DBUS_GLIB_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS)
 endif

 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),qt))
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_QT_LIBS)
 endif

 include $(topsrcdir)/config/rules.mk
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@ -76,11 +76,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL=1
 endif
-
-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@ -60,8 +60,3 @@ CPPSRCS = \
  $(NULL)

 include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += \
-  $(MOZ_COMPONENT_LIBS) \
-  $(ZLIB_LIBS) \
-  $(NULL)
--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@ -68,19 +68,5 @@ SHARED_LIBRARY_LIBS = \
 		../encoders/jpeg/$(LIB_PREFIX)imgjpege_s.$(LIB_SUFFIX)\
 		$(NULL)

-EXTRA_DSO_LIBS	= \
-		gkgfx \
-		thebes \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(JPEG_LIBS) \
-		$(PNG_LIBS) $(ZLIB_LIBS) \
-		$(QCMS_LIBS) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@ -50,17 +50,14 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1

 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS = $(MOZ_GTK2_LIBS)
 PLATFORM = gtk
 endif

 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS = $(MOZ_QT_LIBS)
 PLATFORM = qt
 endif

 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LIBS = gkgfx
 PLATFORM = win
 endif

@ -82,19 +79,6 @@ XPIDLSRCS	= nsIIconURI.idl

 SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)

-EXTRA_DSO_LDOPTS += \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 LOCAL_INCLUDES	= -I$(srcdir)/$(PLATFORM)

-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS		+= $(call EXPAND_LIBNAME,shell32 gdi32 comctl32 ole32)
-endif
-
 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),Darwin)
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
--- a/modules/libpr0n/encoders/jpeg/Makefile.in
+++ b/modules/libpr0n/encoders/jpeg/Makefile.in
@ -46,9 +46,6 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderJPEGModule
 LIBXUL_LIBRARY = 1

-EXTRA_DSO_LIBS	= gkgfx
-
-
 CPPSRCS		= nsJPEGEncoder.cpp

 include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/encoders/png/Makefile.in
+++ b/modules/libpr0n/encoders/png/Makefile.in
@ -46,8 +46,6 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderPNGModule
 LIBXUL_LIBRARY = 1

-EXTRA_DSO_LIBS	= gkgfx
-
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@ -62,11 +62,6 @@ DEFINES += -DOS_ARCH=$(OS_ARCH) \
           -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
           $(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -138,10 +138,6 @@ SHARED_LIBRARY_LIBS += \
  $(NULL)
 LOCAL_INCLUDES += -I$(srcdir)/../wifi

-ifeq ($(OS_ARCH),SunOS)
-OS_LIBS += $(GLIB_LIBS)
-endif
-
 endif


@ -149,38 +145,8 @@ ifdef MOZ_STORAGE
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif

-EXTRA_DSO_LDOPTS = \
-  $(LIBS_DIR) \
-  $(EXTRA_DSO_LIBS) \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(ZLIB_LIBS) \
-  $(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
-  -framework SystemConfiguration \
-  $(TK_LIBS) \
-  $(NULL)
-endif
-
-ifdef MOZ_ENABLE_LIBCONIC
-EXTRA_DSO_LDOPTS += \
-  $(LIBCONIC_LIBS) \
-  $(MOZ_DBUS_LIBS) \
-  $(NULL)
-endif
-
-ifeq ($(OS_ARCH),AIX)
-EXTRA_DSO_LDOPTS += -lodm -lcfg
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
-endif
-
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@ -58,8 +58,6 @@ CPPSRCS = \
  nsResProtocolHandler.cpp \
  $(NULL)

-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/netwerk/base/src \
  $(NULL)
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@ -83,13 +83,6 @@ CPPSRCS += \
 		$(NULL)
 endif

-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/io
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@ -51,8 +51,6 @@ MODULE_NAME	= nsRDFModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1

-EXTRA_DSO_LIBS	= 
-
 CPPSRCS		= \
 		nsRDFModule.cpp \
 		$(NULL)
@ -64,13 +62,6 @@ SHARED_LIBRARY_LIBS = \
 		../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 EXPORTS		= nsRDFCID.h

 include $(topsrcdir)/config/rules.mk
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@ -67,8 +67,3 @@ INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@ -67,10 +67,5 @@ INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@ -121,12 +121,5 @@ DEFINES += -DNSS_ENABLE_ECC
 # so that Mozilla's nss.h is used, not glibc's
 LOCAL_INCLUDES += $(NSS_CFLAGS)

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NSS_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@ -67,9 +67,3 @@ DIRS += tests
 endif

 include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += \
-    $(MOZ_COMPONENT_LIBS) \
-    $(NSPR_LIBS) \
-    $(NSS_LIBS) \
-    $(NULL)
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@ -71,12 +71,4 @@ EXPORTS_mozilla/scache = StartupCache.h \
 XPIDLSRCS = nsIStartupCache.idl \
  $(NULL)

-EXTRA_DSO_LDOPTS += \
-  $(LIBS_DIR) \
-  $(ZLIB_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
-
-
 include $(topsrcdir)/config/rules.mk
--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@ -65,13 +65,5 @@ SHARED_LIBRARY_LIBS = \
 	../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
 	$(NULL)

-EXTRA_DSO_LDOPTS += \
-	$(LIBS_DIR) \
-	$(SQLITE_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_JS_LIBS) \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@ -75,7 +75,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
 endif

 include $(topsrcdir)/config/rules.mk
-
-ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-endif
--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@ -64,11 +64,6 @@ CPPSRCS = \
  nsAutoCompleteSimpleResult.cpp \
  $(NULL)

-EXTRA_DSO_LDOPTS += \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@ -117,7 +117,6 @@ endif

 ifdef MOZ_URL_CLASSIFIER
 SHARED_LIBRARY_LIBS += ../url-classifier/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
-EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
 endif

 ifdef MOZ_FEEDS
@ -128,22 +127,4 @@ ifeq (Android,$(OS_TARGET))
 SHARED_LIBRARY_LIBS += ../webapps/$(LIB_PREFIX)webapps_s.$(LIB_SUFFIX)
 endif

-EXTRA_DSO_LIBS = gkgfx
-
-EXTRA_DSO_LDOPTS += \
-  $(LIBS_DIR) \
-  $(EXTRA_DSO_LIBS) \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(MOZ_JS_LIBS) \
-  $(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32)
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@ -62,15 +62,6 @@ CPPSRCS = \
  nsCommandLine.cpp \
  $(NULL)

-EXTRA_DSO_LDOPTS += \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
 ifdef ENABLE_TESTS
 DIRS += test
 endif
--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@ -60,11 +60,6 @@ CPPSRCS = \
    ctypes.cpp \
    $(NULL)

-EXTRA_DSO_LDOPTS += \
-    $(MOZ_COMPONENT_LIBS) \
-    $(MOZ_JS_LIBS) \
-    $(NULL)
-
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@ -82,5 +82,3 @@ DIRS += test
 endif

 include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@ -66,9 +66,3 @@ endif
 endif

 include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_XUL
-ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-endif
-endif
--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@ -59,11 +59,6 @@ CPPSRCS = \
    PerfMeasurement.cpp \
    $(NULL)

-EXTRA_DSO_LDOPTS += \
-    $(MOZ_COMPONENT_LIBS) \
-    $(MOZ_JS_LIBS) \
-    $(NULL)
-
 ifdef ENABLE_TESTS
 _CHROME_TEST_FILES = \
    test_pm.xul \
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@ -98,12 +98,6 @@ CPPSRCS = \
  VisitInfo.cpp \
  $(NULL)

-EXTRA_DSO_LDOPTS += \
-  $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX) \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(srcdir)/../build

 # This is the default value.  Must be in sync with the one defined in SQLite.
--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@ -65,11 +65,5 @@ endif

 include $(topsrcdir)/config/rules.mk

-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(TK_LIBS)
 CXXFLAGS += $(TK_CFLAGS)

-# Add explicit X11 dependency when building against X11 toolkits
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
-endif
-
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@ -76,17 +76,8 @@ EXTRA_JS_MODULES = \
  nsFormAutoCompleteResult.jsm \
  $(NULL)

-EXTRA_DSO_LIBS = gkgfx
-
 ifdef ENABLE_TESTS
 DIRS += test
 endif

 include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += \
-  $(LIBS_DIR) \
-  $(EXTRA_DSO_LIBS) \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
--- a/toolkit/components/statusfilter/Makefile.in
+++ b/toolkit/components/statusfilter/Makefile.in
@ -53,10 +53,4 @@ CPPSRCS		= \
 		nsBrowserStatusFilter.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/webapps/Makefile.in
+++ b/toolkit/components/webapps/Makefile.in
@ -54,10 +54,6 @@ EXPORT_LIBRARY  = 1
 CPPSRCS = \
        nsWebappsSupport.cpp \
        $(NULL)
-
-EXTRA_DSO_LDOPTS += \
-        $(MOZ_COMPONENT_LIBS) \
-        $(NULL)
 endif

 XPIDLSRCS = nsIWebappsSupport.idl
--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@ -52,16 +52,6 @@ MODULE_NAME     = nsOSXProxyModule
 GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1

-
-FRAMEWORKS += \
-	-framework SystemConfiguration \
-	-framework Cocoa \
-	$(NULL)
-
-OS_LIBS += $(FRAMEWORKS)
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 CMMSRCS = \
        nsOSXSystemProxySettings.mm \
        $(NULL)
--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@ -52,11 +52,6 @@ MODULE_NAME     = nsUnixProxyModule
 GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1

-EXTRA_DSO_LDOPTS += \
-  $(MOZ_LIBPROXY_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
 ifdef MOZ_ENABLE_LIBPROXY

 CPPSRCS = \
--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@ -53,8 +53,6 @@ GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1


-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 CPPSRCS = \
        nsWindowsSystemProxySettings.cpp \
        $(NULL)
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@ -63,11 +63,8 @@ CPPSRCS		= \

 EXPORTS         = nsTraceMalloc.h

-EXTRA_DSO_LDOPTS = $(NSPR_LIBS) $(XPCOM_LIBS)
-
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS		+= nsDebugHelpWin32.cpp nsWinTraceMalloc.cpp
-OS_LIBS		+= shell32.lib ole32.lib uuid.lib imagehlp.lib
 endif

 DEFINES		+= -DMOZ_NO_MOZALLOC
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@ -155,24 +155,20 @@ CPPSRCS	= \
 ifdef MOZ_ENABLE_DBUS
 CPPSRCS += nsDBusHandlerApp.cpp
 LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_DBUS_LIBS)
 endif

 ifdef MOZ_ENABLE_MEEGOTOUCHSHARE
 OSHELPER  += nsMeegoExternalSharingAppService.cpp
 LOCAL_INCLUDES   += $(MOZ_PLATFORM_MAEMO_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 EXPORTS += nsExternalSharingAppService.h
 endif

 ifeq ($(MOZ_PLATFORM_MAEMO),5)
 ifdef MOZ_ENABLE_GNOMEVFS
 LOCAL_INCLUDES   += $(MOZ_GNOMEVFS_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_GNOMEVFS_LIBS)
 endif
 ifdef MOZ_ENABLE_GIO
 LOCAL_INCLUDES   += $(MOZ_GIO_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_GIO_LIBS)
 endif
 endif

--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@ -49,9 +49,6 @@ MODULE_NAME	= nsViewModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1

-
-EXTRA_DSO_LIBS = gkgfx
-
 CPPSRCS		= \
 		nsView.cpp \
 		nsViewManager.cpp \
--- a/widget/src/android/Makefile.in
+++ b/widget/src/android/Makefile.in
@ -81,17 +81,6 @@ NOT_THERE_YET_CPPSRCS = \

 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

-EXTRA_DSO_LDOPTS = \
-	$(MOZ_COMPONENT_LIBS) \
-	-lgkgfx \
-	-lthebes \
-	$(MOZ_JS_LIBS) \
-	$(QCMS_LIBS) \
-	$(NULL)
-
-
-EXTRA_DSO_LDOPTS += -L$(DIST)/lib
-
 EXPORTS = AndroidBridge.h AndroidJavaWrappers.h

 include $(topsrcdir)/config/rules.mk
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@ -53,31 +53,17 @@ LIBXUL_LIBRARY = 1

 CPPSRCS		= nsWinWidgetFactory.cpp

-EXTRA_DSO_LIBS	= gkgfx \
-		  thebes \
-		  $(NULL)
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/../windows \
 		$(NULL)

-OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 ws2_32 comctl32 comdlg32 shell32 imm32 shlwapi winspool msimg32)
-
 SHARED_LIBRARY_LIBS = \
 		../windows/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
 		../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
 		$(NULL)

-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(QCMS_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@ -106,15 +106,6 @@ XPIDLSRCS	+= \

 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(TK_LIBS) \
-		$(call EXPAND_LIBNAME_PATH,gkgfx,$(DEPTH)/gfx/src) \
-		$(MOZ_COMPONENT_LIBS) \
-		-lthebes \
-		$(QCMS_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 NIB_FILES = \
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@ -107,30 +107,6 @@ endif

 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		-lgkgfx \
-		-lthebes \
-		$(MOZ_CAIRO_LIBS) \
-                $(MOZ_STARTUP_NOTIFICATION_LIBS) \
-		$(XLDFLAGS) \
-		$(XLIBS) \
-		$(XEXT_LIBS) \
-		$(XCOMPOSITE_LIBS) \
-		$(MOZ_GTK2_LIBS) \
-		$(QCMS_LIBS) \
-		$(NULL)
-
-ifdef MOZ_PLATFORM_MAEMO
-ifdef MOZ_ENABLE_GCONF
-EXTRA_DSO_LDOPTS += $(MOZ_GCONF_LIBS)
-endif
-endif
-
-ifdef MOZ_X11
-EXTRA_DSO_LDOPTS += -lgtkxtbin -lXrender
-endif
-
 EXPORTS		= \
                nsGTKToolkit.h \
 		nsIImageToPixbuf.h \
--- a/widget/src/gtkxtbin/Makefile.in
+++ b/widget/src/gtkxtbin/Makefile.in
@ -53,7 +53,6 @@ ifdef MOZ_ENABLE_GTK2
 CSRCS		= \
 		gtk2xtbin.c \
 		$(NULL)
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
 endif

 EXPORTS         = gtk2xtbin.h 
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@ -78,16 +78,6 @@ SHARED_LIBRARY_LIBS = \
 	../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
 	$(NULL)

-EXTRA_DSO_LIBS	= gkgfx
-
-EXTRA_DSO_LDOPTS = \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		-lthebes \
-		$(QCMS_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@ -89,20 +89,6 @@ endif

 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		-lgkgfx \
-		-lthebes \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_QT_LIBS) \
-		$(GLIB_LIBS) \
-		$(QCMS_LIBS) \
-		$(XEXT_LIBS) \
-		$(NULL)
-
-
-EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(MOZ_XLIB_LDFLAGS) $(XLIBS)
-
 # If not primary toolkit, install in secondary path
 ifneq (qt,$(MOZ_WIDGET_TOOLKIT))
 INACTIVE_COMPONENT = 1
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -128,9 +128,6 @@ EXPORTS_mozilla = \
 # Force use of PIC
 FORCE_USE_PIC	= 1 

-# UNIX98 iconv support
-OS_LIBS += $(LIBICONV)
-
 GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))

 include $(topsrcdir)/config/config.mk
@ -143,39 +140,13 @@ DEFINES		+= \
 		-DEXPORT_XPT_API \
 		-DEXPORT_XPTC_API

-EXTRA_DSO_LDOPTS +=				\
-	$(MOZALLOC_LIB)				\
-	$(NSPR_LIBS)				\
-	$(NULL)
-
 ifdef TARGET_XPCOM_ABI
 DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
 endif

 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CXXFLAGS	+= $(TK_CFLAGS)
-EXTRA_DSO_LDOPTS += \
-  $(TK_LIBS) \
-  $(NULL)
 endif

-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-ifdef MOZ_PLATFORM_MAEMO
-EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
-endif
-endif
-
-ifdef HAVE_CLOCK_MONOTONIC
-EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version)
-ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
-OS_LIBS += $(call EXPAND_LIBNAME,imagehlp)
-endif
-endif # WINNT
-
 export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS)
 	$(INSTALL) $^ .
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -63,13 +63,5 @@ CPPSRCS		= \
 		nsAppShellFactory.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/xpfe/components/autocomplete/src/Makefile.in
+++ b/xpfe/components/autocomplete/src/Makefile.in
@ -52,9 +52,4 @@ IS_COMPONENT	= 1

 CPPSRCS		= nsAutoComplete.cpp

-EXTRA_DSO_LDOPTS += \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@ -58,15 +58,4 @@ include $(topsrcdir)/config/config.mk
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory

-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
-endif
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_JS_LIBS) \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/windowds/Makefile.in
+++ b/xpfe/components/windowds/Makefile.in
@ -55,8 +55,4 @@ CPPSRCS = nsWindowDataSource.cpp

 XPIDLSRCS = nsIWindowDataSource.idl

-EXTRA_DSO_LDOPTS = \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@ -71,11 +71,4 @@ CPPSRCS		= \

 LOCAL_INCLUDES	= -I$(srcdir)/../public

-EXTRA_DSO_LDOPTS = \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk