--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -66,34 +66,10 @@ SHARED_LIBRARY_LIBS = \
 ifdef MOZ_XUL
 SHARED_LIBRARY_LIBS += ../src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
 endif
 
 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
@@ -83,18 +83,16 @@ EXPORTS = \
   nsHTMLImageAccessibleWrap.h \
   nsHTMLTableAccessibleWrap.h \
   nsAccessibleRelationWrap.h \
   $(NULL)
 
 # 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)
 CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \

--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -56,29 +56,16 @@ EXPORTS_mozilla/chrome = \
 
 CPPSRCS		= \
 		nsChromeRegistry.cpp \
 		nsChromeRegistryChrome.cpp \
 		nsChromeProtocolHandler.cpp \
 		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
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/protocol/res \
 		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)

--- a/config/config.mk
+++ b/config/config.mk
@@ -552,20 +552,16 @@ DEPENDENCIES	= .md
 MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
 
 ifeq ($(OS_ARCH),OS2)
 ELF_DYNSTR_GC	= echo
 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
 ELF_DYNSTR_GC 	= $(DEPTH)/config/elf-dynstr-gc
 endif
 endif
 endif
 

--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -54,15 +54,10 @@ CPPSRCS		= nsMorkFactory.cpp
 
 EXPORTS		= \
 		nsMorkCID.h \
 		nsIMdbFactoryFactory.h \
 		$(NULL)
 
 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
@@ -64,49 +64,22 @@ CPPSRCS		= \
 SHARED_LIBRARY_LIBS= \
 		../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
 		../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	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../shistory/src \
 		-I$(topsrcdir)/uriloader/base \
 		-I$(topsrcdir)/uriloader/prefetch \
 		-I$(topsrcdir)/uriloader/exthandler \
 		$(NULL)
 
 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
@@ -49,15 +49,11 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 
 
 CPPSRCS		= nsSHEntry.cpp        \
             nsSHTransaction.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
@@ -127,49 +127,19 @@ endif
 endif
 endif
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/base/ \
   $(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 $@
 
 export:: $(DIST)/bin/plugins

--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -49,20 +49,16 @@ LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 
 
 CPPSRCS		= \
 		nsGeolocation.cpp \
 		nsGeoPosition.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
 EXPORTS        = nsGeoPosition.h

--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -58,21 +58,16 @@ CPPSRCS		= nsJSProtocolHandler.cpp
 
 EXPORTS		= $(srcdir)/nsJSProtocolHandler.h
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-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
 
 DIRS            = $(NULL)
 ifdef ENABLE_TESTS
 DIRS            += test
 endif

--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -47,20 +47,16 @@ LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 CPPSRCS		= \
 		nsDesktopNotification.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk

--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -56,20 +56,16 @@ CPPSRCS  = \
            nsComposerCommands.cpp         \
            nsComposerDocumentCommands.cpp \
            nsComposerRegistration.cpp     \
            nsEditingSession.cpp	          \
            nsComposerCommandsUpdater.cpp  \
            nsEditorSpellCheck.cpp         \
            $(NULL)
 
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS)
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += -I../../libeditor/base/src
 
 _FILES = \
 	$(srcdir)/res/EditorOverride.css \
 	$(srcdir)/res/grabber.gif \
 	$(srcdir)/res/table-add-column-after-active.gif \

--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -53,14 +53,10 @@ LIBXUL_LIBRARY	= 1
 CPPSRCS		= \
 		nsTransactionItem.cpp \
 		nsTransactionList.cpp \
 		nsTransactionManager.cpp \
 		nsTransactionManagerFactory.cpp \
 		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
@@ -49,16 +49,10 @@ MODULE_NAME	= nsTextServicesModule
 LIBXUL_LIBRARY	= 1
 
 
 CPPSRCS		= \
 		nsFilteredContentIterator.cpp \
 		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
@@ -47,36 +47,23 @@ MODULE		= webbrwsr
 LIBRARY_NAME	= webbrwsr
 IS_COMPONENT	= 1
 MODULE_NAME	= Browser_Embedding_Module
 EXPORT_LIBRARY	= 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
-EXTRA_DSO_LIBS	= gkgfx thebes
-
 CPPSRCS		= \
 		nsWebBrowserModule.cpp		\
 		$(NULL)
 
 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	+= \
 		-I$(srcdir)			\
 		-I$(srcdir)/../webBrowser		\
 		-I$(srcdir)/../setup		\
 		$(NULL)

--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -81,32 +81,15 @@ LOCAL_INCLUDES += -I$(srcdir)/../printin
 endif
 
 ifdef MOZ_PDF_PRINTING
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/unixshared 
 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
@@ -50,19 +50,14 @@ LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= \
       nsPrintingPromptService.cpp \
       nsPrintProgressParams.cpp \
       nsPrintProgress.cpp \
       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
 
 include $(topsrcdir)/config/rules.mk
 

--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -53,26 +53,20 @@ IS_COMPONENT	= 1
 EXPORT_LIBRARY	= 1
 MODULE_NAME	= nsAuthModule
 LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
 		nsAuthFactory.cpp \
 		nsHttpNegotiateAuth.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
+		nsAuthGSSAPI.cpp \
+		nsAuthSASL.cpp \
 		$(NULL)
 
-CPPSRCS		+= \
-		nsAuthGSSAPI.cpp \
-		nsAuthSASL.cpp
-
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -DUSE_SSPI
 CPPSRCS		+= nsAuthSSPI.cpp
 else
 CPPSRCS   += nsAuthSambaNTLM.cpp
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -60,20 +60,16 @@ CPPSRCS		= \
 		nsCookiePermission.cpp \
 		$(NULL)
 
 XPIDLSRCS	= \
 		nsICookieAcceptDialog.idl \
 		nsICookiePromptService.idl \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 ifdef MOZ_MAIL_NEWS
 DEFINES += -DMOZ_MAIL_NEWS
 endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS		+= test
 endif
 

--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -50,13 +50,9 @@ MODULE_NAME	= nsPermissionsModule
 LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
 		  nsModuleFactory.cpp \
 		  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
@@ -60,23 +60,16 @@ CPPSRCS          = nsReadConfig.cpp    \
                    nsJSConfigTriggers.cpp \
                    $(NULL)
 
 ifdef MOZ_LDAP_XPCOM
 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)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), windows)

--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -50,21 +50,16 @@ SHORT_LIBNAME = syspref
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_ENABLE_GTK2
 DIRS		= gconf
 endif
 
-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 CPPSRCS =   \
   nsSystemPref.cpp	   \
   $(NULL)
 
 EXPORTS		= \
 		nsSystemPrefLog.h \
 		$(NULL)
 

--- a/extensions/pref/system-pref/src/gconf/Makefile.in
+++ b/extensions/pref/system-pref/src/gconf/Makefile.in
@@ -49,22 +49,16 @@ LIBXUL_LIBRARY = 1
 
 CPPSRCS =   \
 	nsSystemPrefService.cpp       \
 	nsSystemPrefFactory.cpp \
 	$(NULL)
 
 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
 
 EXPORTS		= \
 		nsSystemPrefService.h \
 		$(NULL)
 

--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -62,21 +62,13 @@ CPPSRCS         += affentry.cpp \
                    phonet.cpp \
                    replist.cpp \
                    suggestmgr.cpp \
                    $(NULL)
 
 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
 CXXFLAGS += $(MOZ_HUNSPELL_CFLAGS)
 endif

--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -60,20 +60,13 @@ CPPSRCS		= \
 		mozSpellI18NManager.cpp		\
 		mozInlineSpellChecker.cpp	\
 		mozInlineSpellWordUtil.cpp      \
 		$(NULL)
 
 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 += \
 	-I$(topsrcdir)/xpcom/io \
 	$(NULL)

--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -59,13 +59,9 @@ CPPSRCS = \
                $(NULL)
 
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 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
@@ -133,17 +133,16 @@ CPPSRCS += nsSystemFontsOS2.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CPPSRCS += nsSystemFontsQt.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS += nsSystemFontsWin.cpp
-OS_LIBS += $(call EXPAND_LIBNAME,usp10)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS) $(MOZ_CAIRO_CFLAGS)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 DEFINES += -DMOZ_ENABLE_GTK2

--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -199,71 +199,49 @@ endif
 
 endif
 
 SHARED_LIBRARY_LIBS += \
 	../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \
 	$(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 \
 		gfxWindowsNativeDrawing.cpp \
 		nsUnicodeRange.cpp \
 		$(NULL)
 
 ifdef WINCE
 CPPSRCS	+= gfxFT2Fonts.cpp \
 	   gfxFT2FontBase.cpp \
 	   gfxFT2Utils.cpp \
 	   gfxFT2FontList.cpp \
 	   $(NULL)
 
-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
-
-OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
 else
 ifdef MOZ_ENABLE_DWRITE_FONT
 CPPSRCS	+= gfxDWriteFonts.cpp \
 	   gfxDWriteShaper.cpp \
 	   gfxDWriteTextAnalysis.cpp \
 	   gfxDWriteCommon.cpp \
 	   gfxD2DSurface.cpp \
 	   gfxDWriteFontList.cpp \
 	   $(NULL)
 endif
 CPPSRCS	+= gfxGDIFont.cpp \
 	   gfxGDIFontList.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
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES +=	-DMOZ_ENABLE_D3D10_LAYER
 endif
 
@@ -313,17 +291,16 @@ CPPSRCS +=	gfxFontconfigUtils.cpp
 CPPSRCS +=	gfxFT2FontBase.cpp
 CPPSRCS +=	gfxFT2Utils.cpp
 CPPSRCS +=	nsUnicodeRange.cpp
 
 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
 CPPSRCS += gfxDirectFBSurface.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
@@ -333,17 +310,16 @@ CPPSRCS += gfxPangoFonts.cpp
 else
 CPPSRCS += gfxFT2Fonts.cpp
 endif
 CPPSRCS +=	gfxFT2FontBase.cpp
 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)
 CPPSRCS	+= \
 	gfxQuartzSurface.cpp \
 	gfxQuartzImageSurface.cpp \
 	gfxQuartzPDFSurface.cpp \
 	gfxPlatformMac.cpp \
@@ -354,24 +330,20 @@ CPPSRCS	+= \
 CPPSRCS +=      nsUnicodeRange.cpp
 CPPSRCS +=      gfxQuartzNativeDrawing.cpp
 
 CMMSRCS = \
 	gfxMacPlatformFontList.mm \
 	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)
 ifndef WINCE
 GL_PROVIDER = WGL
 endif
 endif
 

--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -90,16 +90,9 @@ ifeq (arm,$(findstring arm,$(OS_TEST)))
 ifdef HAVE_ARM_NEON
 CPPSRCS += yuv_convert_arm.cpp \
            $(NULL)
 ASFILES = yuv_row_arm.$(ASM_SUFFIX) \
           $(NULL)
 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
@@ -77,30 +77,9 @@ SHARED_LIBRARY_LIBS = \
 			../lwbrk/src/$(LIB_PREFIX)lwbrk_s.$(LIB_SUFFIX) \
 			../unicharutil/src/$(LIB_PREFIX)ucharucomp_s.$(LIB_SUFFIX) \
 			../strres/src/$(LIB_PREFIX)strres_s.$(LIB_SUFFIX) \
 			../locale/src/$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX) \
 			../locale/src/$(LOCALE_DIR)/$(LIB_PREFIX)platlocale_s.$(LIB_SUFFIX) \
 			../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
@@ -54,14 +54,9 @@ LIBXUL_LIBRARY  = 1
 CPPSRCS		= \
 		nsObserverBase.cpp \
 		nsDebugDetector.cpp \
 		nsCyrillicDetector.cpp \
 		nsDocumentCharsetInfo.cpp \
 		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
@@ -81,29 +81,16 @@ ifdef GNU_CC
 nsUTF8ToUnicodeSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 endif
 
 ifdef SOLARIS_SUNPRO_CXX
 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 \
 		  -I$(srcdir)/../ucvja \
 		  -I$(srcdir)/../ucvtw2 \
 		  -I$(srcdir)/../ucvtw \
 		  -I$(srcdir)/../ucvko \
 		  -I$(srcdir)/../ucvcn \

--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -61,13 +61,10 @@ EXPORTS		= \
 		nsUCVJACID.h \
 		nsUCVJA2CID.h \
 		$(NULL)
 
 #SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX)
 
 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
@@ -54,12 +54,10 @@ CPPSRCS		= \
 		$(NULL)
 
 #SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX)
 
 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
@@ -53,21 +53,16 @@ IS_COMPONENT = 1
 LIBXUL_LIBRARY = 1
 
 MODULE_NAME = JavaScript_Debugger
 EXPORT_LIBRARY = 1
 
 
 # REQUIRES	= java js
 
-
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
 EXPORTS		= jsdebug.h
 
 ifdef JS_THREADSAFE
 DEFINES         += -DJS_THREADSAFE
 endif
 
 CSRCS		= \
 		  jsdebug.c \

--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -552,20 +552,16 @@ DEPENDENCIES	= .md
 MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
 
 ifeq ($(OS_ARCH),OS2)
 ELF_DYNSTR_GC	= echo
 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
 ELF_DYNSTR_GC 	= $(DEPTH)/config/elf-dynstr-gc
 endif
 endif
 endif
 

--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -118,21 +118,16 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/html/content/src \
 		-I$(topsrcdir)/content/html/document/src \
 		-I$(topsrcdir)/content/svg/content/src \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/layout/base \
 		-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) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \

--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -53,18 +53,16 @@ endif
 MODULE		= layout
 LIBRARY_NAME	= gklayout
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
-EXTRA_DSO_LIBS	+= thebes ycbcr
-
 
 CPPSRCS		= \
 		nsLayoutModule.cpp \
 		nsContentDLF.cpp \
 		nsLayoutStatics.cpp \
 		$(NULL)
 
 EXPORTS		= \
@@ -237,57 +235,16 @@ SHARED_LIBRARY_LIBS += \
 
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 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
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(srcdir)/../generic \
 		   -I$(srcdir)/../forms \

--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -62,20 +62,14 @@ EXPORTS		= \
 
 CPPSRCS		= \
 		nsDebugFactory.cpp \
 		nsLayoutDebugCLH.cpp \
 		nsLayoutDebuggingTools.cpp \
 		nsRegressionTester.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIRS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 
 clobber::
 				rm -f $(DIST)\lib\library

--- a/mobile/components/build/Makefile.in
+++ b/mobile/components/build/Makefile.in
@@ -64,26 +64,18 @@ CPPSRCS = \
 	nsBrowserModule.cpp \
 	$(NULL)
 
 ifndef ANDROID
 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
@@ -71,16 +71,8 @@ XPIDLSRCS	= $(MODULES_LIBJAR_LXPIDLSRCS)
 EXPORTS		= $(MODULES_LIBJAR_LEXPORTS)
 
 include $(topsrcdir)/config/rules.mk
 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
@@ -55,13 +55,8 @@ CPPSRCS = \
   nsDeflateConverter.cpp \
   nsZipHeader.cpp \
   nsZipDataStream.cpp \
   nsZipWriter.cpp \
   ZipWriterModule.cpp \
   $(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
@@ -63,24 +63,10 @@ LOCAL_INCLUDES	= \
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)imglib2_s.$(LIB_SUFFIX) \
 		../decoders/$(LIB_PREFIX)imgdecoders_s.$(LIB_SUFFIX) \
 		../encoders/png/$(LIB_PREFIX)imgpnge_s.$(LIB_SUFFIX)\
 		../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
@@ -45,27 +45,24 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= imgicon
 LIBRARY_NAME	= imgicon
 IS_COMPONENT	= 1
 MODULE_NAME	= nsIconDecoderModule
 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
 
 ifeq ($(OS_ARCH),OS2)
 PLATFORM = os2
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -77,24 +74,11 @@ CPPSRCS		= \
 		nsIconModule.cpp \
 		nsIconProtocolHandler.cpp \
 		$(NULL)
 
 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
@@ -41,16 +41,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= imgjpege
 LIBRARY_NAME	= imgjpege_s
 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
@@ -41,18 +41,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= imgpnge
 LIBRARY_NAME	= imgpnge_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderPNGModule
 LIBXUL_LIBRARY = 1
 
-EXTRA_DSO_LIBS	= gkgfx
-
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
 
 CPPSRCS		= nsPNGEncoder.cpp
 
 include $(topsrcdir)/config/rules.mk
 

--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -57,21 +57,16 @@ CPPSRCS		= \
 			  prefread.cpp \
 			  Preferences.cpp	\
 			 $(NULL)
 
 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
 
 GARBAGE		+= $(addprefix $(DIST)/bin/defaults/pref/, \
 			mailnews.js editor.js \
 			aix.js unix.js winpref.js os2prefs.js)
 

--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -133,54 +133,20 @@ LOCAL_INCLUDES += -I$(srcdir)/../cookie
 endif
 
 ifdef NECKO_WIFI
 SHARED_LIBRARY_LIBS += \
   ../wifi/$(LIB_PREFIX)neckowifi_s.$(LIB_SUFFIX) \
   $(NULL)
 LOCAL_INCLUDES += -I$(srcdir)/../wifi
 
-ifeq ($(OS_ARCH),SunOS)
-OS_LIBS += $(GLIB_LIBS)
-endif
-
 endif
 
 
 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
@@ -53,18 +53,16 @@ FORCE_STATIC_LIB = 1
 XPIDLSRCS = \
   nsIResProtocolHandler.idl \
   $(NULL)
 
 CPPSRCS = \
   nsResProtocolHandler.cpp \
   $(NULL)
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 

--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -78,18 +78,11 @@ CPPSRCS = \
 		$(NULL)
 
 ifdef MOZ_DEBUG
 CPPSRCS += \
 		nsLoggingSink.cpp   \
 		$(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
@@ -46,36 +46,27 @@ MODULE		= rdf
 
 LIBRARY_NAME	= rdf
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsRDFModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
-EXTRA_DSO_LIBS	= 
-
 CPPSRCS		= \
 		nsRDFModule.cpp \
 		$(NULL)
 
 # XXX Note dependencies on implementation headers for factory functions
 
 SHARED_LIBRARY_LIBS = \
 		../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
 		../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
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../content/src \
 		-I$(srcdir)/../datasource/src \

--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -62,13 +62,8 @@ CPPSRCS = \
 
 
 include $(topsrcdir)/config/rules.mk
 
 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
@@ -62,15 +62,10 @@ CPPSRCS = \
 	nsFormSigningDialog.cpp \
 	$(NULL)
 
 
 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
@@ -116,17 +116,10 @@ CSRCS += md4.c
 EXTRA_DEPS = $(NSS_DEP_LIBS)
 
 DEFINES += -DNSS_ENABLE_ECC
 
 # Use local includes because they are inserted before INCLUDES
 # 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
@@ -62,14 +62,8 @@ CPPSRCS = \
   nsSyncJPAKE.cpp \
   $(NULL)
 
 ifdef ENABLE_TESTS
 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
@@ -66,17 +66,9 @@ CPPSRCS = StartupCache.cpp \
 EXPORTS_NAMESPACES = mozilla/scache
 EXPORTS_mozilla/scache = StartupCache.h \
   StartupCacheUtils.h \
   $(NULL)
 
 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
@@ -60,18 +60,10 @@ CPPSRCS = mozStorageModule.cpp
 LOCAL_INCLUDES = \
 	$(SQLITE_CFLAGS) \
 	-I$(srcdir)/../src
 
 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
@@ -70,12 +70,8 @@ DIRS += test
 endif
 
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
 include $(topsrcdir)/config/config.mk
 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
@@ -59,18 +59,13 @@ XPIDLSRCS = \
   nsIAutoCompleteSimpleResult.idl \
   $(NULL)
 
 CPPSRCS = \
   nsAutoCompleteController.cpp \
   nsAutoCompleteSimpleResult.cpp \
   $(NULL)
 
-EXTRA_DSO_LDOPTS += \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -112,38 +112,19 @@ SHARED_LIBRARY_LIBS += ../alerts/$(LIB_P
 endif
 ifdef ALERTS_SERVICE_MAC
 SHARED_LIBRARY_LIBS += ../alerts/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 SHARED_LIBRARY_LIBS += ../alerts/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
 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
 SHARED_LIBRARY_LIBS += ../feeds/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
 endif
 
 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
@@ -57,22 +57,13 @@ XPIDLSRCS = \
   nsICommandLineRunner.idl \
   nsICommandLineValidator.idl \
   $(NULL)
 
 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
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -55,18 +55,13 @@ LIBRARY_NAME = jsctypes
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 CPPSRCS = \
     ctypes.cpp \
     $(NULL)
 
-EXTRA_DSO_LDOPTS += \
-    $(MOZ_COMPONENT_LIBS) \
-    $(MOZ_JS_LIBS) \
-    $(NULL)
-
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -77,10 +77,8 @@ EXTRA_COMPONENTS = \
   $(NULL)
 endif
 
 ifdef ENABLE_TESTS
 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
@@ -61,14 +61,8 @@ CPPSRCS = \
   nsFileView.cpp \
   $(NULL)
 EXTRA_COMPONENTS = nsFilePicker.js
 EXTRA_PP_COMPONENTS = nsFilePicker.manifest
 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
@@ -54,21 +54,16 @@ LIBRARY_NAME = jsperf
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 CPPSRCS = \
     PerfMeasurement.cpp \
     $(NULL)
 
-EXTRA_DSO_LDOPTS += \
-    $(MOZ_COMPONENT_LIBS) \
-    $(MOZ_JS_LIBS) \
-    $(NULL)
-
 ifdef ENABLE_TESTS
 _CHROME_TEST_FILES = \
     test_pm.xul \
     $(NULL)
 
 chrometestdir = \
   $(DEPTH)/_tests/testing/mochitest/chrome/toolkit/components/$(MODULE)
 endif

--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -93,22 +93,16 @@ CPPSRCS = \
   Helpers.cpp \
   History.cpp \
   nsPlacesImportExportService.cpp \
   AsyncFaviconHelpers.cpp \
   PlaceInfo.cpp \
   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.
 DEFINES += -DSQLITE_DEFAULT_PAGE_SIZE=32768
 
 EXTRA_COMPONENTS = \
   toolkitplaces.manifest \
   nsLivemarkService.js \

--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@@ -60,16 +60,10 @@ CPPSRCS += nsGTKRemoteService.cpp
 endif
 
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += nsQtRemoteService.cpp
 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
@@ -71,22 +71,13 @@ EXTRA_COMPONENTS = \
   nsInputListAutoComplete.js \
   satchel.manifest \
   $(NULL)
 
 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
@@ -48,15 +48,9 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 MODULE_NAME	= nsBrowserModule
 
 
 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
@@ -49,17 +49,13 @@ ifeq (Android,$(OS_TARGET))
 LIBRARY_NAME    = webapps_s
 LIBXUL_LIBRARY  = 1
 IS_COMPONENT    = 1
 EXPORT_LIBRARY  = 1
 
 CPPSRCS = \
         nsWebappsSupport.cpp \
         $(NULL)
-
-EXTRA_DSO_LDOPTS += \
-        $(MOZ_COMPONENT_LIBS) \
-        $(NULL)
 endif
 
 XPIDLSRCS = nsIWebappsSupport.idl
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -47,23 +47,13 @@ MODULE          = osxproxy
 LIBRARY_NAME    = osxproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 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)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -47,21 +47,16 @@ MODULE          = unixproxy
 LIBRARY_NAME    = unixproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsUnixProxyModule
 GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
-EXTRA_DSO_LDOPTS += \
-  $(MOZ_LIBPROXY_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-
 ifdef MOZ_ENABLE_LIBPROXY
 
 CPPSRCS = \
        nsLibProxySettings.cpp \
         $(NULL)
 
 CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS)
 

--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -48,15 +48,13 @@ LIBRARY_NAME    = windowsproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWindowsProxyModule
 GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 CPPSRCS = \
         nsWindowsSystemProxySettings.cpp \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -58,21 +58,18 @@ CSRCS		= \
 		$(NULL)
 
 CPPSRCS		= \
 		nsTypeInfo.cpp \
 		$(NULL)
 
 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
 
 ifdef WRAP_SYSTEM_INCLUDES
 DEFINES		+= -DWRAP_SYSTEM_INCLUDES
 endif
 

--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -150,34 +150,30 @@ CPPSRCS	= \
 	$(OSHELPER) \
 	ExternalHelperAppChild.cpp \
 	ExternalHelperAppParent.cpp \
 	$(NULL)
 
 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
 
 ifdef MOZ_ENABLE_CONTENTACTION
 CPPSRCS += nsContentHandlerApp.cpp
 endif
 
 EXTRA_COMPONENTS = \

--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -44,19 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= view
 LIBRARY_NAME	= gkview_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsViewModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
-
-EXTRA_DSO_LIBS = gkgfx
-
 CPPSRCS		= \
 		nsView.cpp \
 		nsViewManager.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = \

--- a/widget/src/android/Makefile.in
+++ b/widget/src/android/Makefile.in
@@ -76,27 +76,16 @@ NOT_THERE_YET_CPPSRCS = \
 	nsDragService.cpp \
 	nsNativeThemeQt.cpp \
 	mozqwidget.cpp \
 	nsSound.cpp \
 	$(NULL)
 
 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
 
 DEFINES += -D_IMPL_NS_WIDGET
 #DEFINES += -DDEBUG_WIDGETS
 
 LOCAL_INCLUDES += \

--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -48,38 +48,24 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 RESFILE		= widget.res
 MODULE_NAME	= nsWidgetModule
 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
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -101,25 +101,16 @@ CMMSRCS += ComplexTextInputPanel.mm
 endif
 
 XPIDLSRCS	+= \
 		nsPIWidgetCocoa.idl \
 		$(NULL)
 
 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 = \
 	classes.nib \
 	info.nib \
 	keyedobjects.nib \
 	$(NULL)
 NIB_DEST = $(DIST)/bin/res/MainMenu.nib

--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -102,40 +102,16 @@ CPPSRCS += 	nsClipboard.cpp \
 		nsDragService.cpp \
 		$(NULL)
 endif
 
 # build our subdirs, too
 
 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 \
 		mozcontainer.h \
 		$(NULL)
 
 ifdef NATIVE_THEME_SUPPORT
 CSRCS		+= gtk2drawing.c

--- a/widget/src/gtkxtbin/Makefile.in
+++ b/widget/src/gtkxtbin/Makefile.in
@@ -48,17 +48,16 @@ MODULE          = gtkxtbin
 LIBRARY_NAME	= gtkxtbin
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
 ifdef MOZ_ENABLE_GTK2
 CSRCS		= \
 		gtk2xtbin.c \
 		$(NULL)
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
 endif
 
 EXPORTS         = gtk2xtbin.h 
 
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK2

--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@@ -73,26 +73,16 @@ CPPSRCS		= \
 		nsRwsService.cpp \
 		nsIdleServiceOS2.cpp \
 		$(NULL)
 
 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)
 
 DEFINES		+= -D_IMPL_NS_WIDGET
 
 DEFINES += -DUSE_OS2_TOOLKIT_HEADERS
 

--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@@ -84,30 +84,16 @@ CPPSRCS	= \
 
 ifdef MOZ_ENABLE_QTMOBILITY
 MOCSRCS += moc_mozqorientationsensorfilter.cpp
 CPPSRCS += mozqorientationsensorfilter.cpp
 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
 endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -123,59 +123,30 @@ EXPORTS_mozilla = \
   Services.h \
   ServiceList.h \
   Omnijar.h \
   $(NULL)
 
 # 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
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= \
 		-D_IMPL_NS_COM \
 		-D_IMPL_NS_STRINGAPI \
 		-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
@@ -58,18 +58,10 @@ CPPSRCS		= \
 		nsXULWindow.cpp \
 		nsAppShellService.cpp \
 		nsAppShellWindowEnumerator.cpp \
 		nsWebShellWindow.cpp \
 		nsWindowMediator.cpp \
 		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
@@ -47,14 +47,9 @@ MODULE_NAME	= xpAutoComplete
 LIBRARY_NAME	= xpautocomplete
 SHORT_LIBNAME	= xpautoc
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY  = 1
 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
@@ -53,20 +53,9 @@ LIBXUL_LIBRARY	= 1
 CPPSRCS		= nsModule.cpp
 
 include $(topsrcdir)/config/config.mk
 
 # General includes
 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
@@ -50,13 +50,9 @@ LIBXUL_LIBRARY   = 1
 IS_COMPONENT     = 1
 EXPORT_LIBRARY   = 1
 
 
 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
@@ -66,16 +66,9 @@ CPPSRCS		= \
 		nsSoftwareUpdate.cpp \
 		nsXPITriggerInfo.cpp \
 		nsXPInstallManager.cpp \
 		nsXPIInstallInfo.cpp \
 		$(NULL)
 
 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