General cleanup of the shared library rules.

Quick fix for bug #36844.
Since people kept forgetting to wrap SHARED_LIBRARY_LIBS inside MKSHLIB_FORCE_ALL & MKSHLIB_UNFORCE_ALL pairs, we now handle it in rules.mk.  Same goes for making $(SHARED_LIBRARY) dependent upon $(SHARED_LIBRARY_LIBS).

config/rules.mk

@@ -300,6 +300,14 @@ ifdef CPPSRCS
 CPP_PROG_LINK		= 1
 endif
 
+#
+# Make sure to wrap static libs inside linker specific flags to turn on & off
+# inclusion of all symbols inside the static libs
+#
+ifdef SHARED_LIBRARY_LIBS
+EXTRA_DSO_LDOPTS := $(MKSHLIB_FORCE_ALL) $(SHARED_LIBRARY_LIBS) $(MKSHLIB_UNFORCE_ALL) $(EXTRA_DSO_LDOPTS)
+endif
+
 #
 # This will strip out symbols that the component shouldnt be 
 # exporting from the .dynsym section.
@@ -667,7 +675,7 @@ endif
 SUB_LOBJS	= $(shell for lib in $(SHARED_LIBRARY_LIBS); do $(AR_LIST) $${lib} $(CLEANUP1); done;)
 endif
 
-$(LIBRARY): $(OBJS) $(LOBJS) Makefile Makefile.in
+$(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) Makefile Makefile.in
 	rm -f $@
 ifdef SHARED_LIBRARY_LIBS
 	@rm -f $(SUB_LOBJS)
@@ -710,26 +718,21 @@ $(HOST_LIBRARY): $(HOST_OBJS) Makefile
 	$(HOST_AR) $(HOST_AR_FLAGS) $@ $(HOST_OBJS)
 	$(HOST_RANLIB) $@
 
-ifneq ($(OS_ARCH),OS2)
-$(SHARED_LIBRARY): $(OBJS) $(LOBJS) Makefile Makefile.in
+ifdef NO_LD_ARCHIVE_FLAGS
+SUB_SHLOBJS = $(SUB_LOBJS)
+endif
+
+$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(SHARED_LIBRARY_LIBS) Makefile Makefile.in
 	rm -f $@
 ifneq ($(OS_ARCH),OpenVMS)
-ifeq ($(NO_LD_ARCHIVE_FLAGS),1)
+ifdef NO_LD_ARCHIVE_FLAGS
 ifdef SHARED_LIBRARY_LIBS
-	@rm -f $(SUB_LOBJS)
+	@rm -f $(SUB_SHLOBJS)
 	@for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done
-ifeq ($(TARGET_MD_ARCH), win32)
-	$(MKSHLIB) $(OBJS) $(LOBJS) $(SUB_LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
-else
-	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(SUB_LOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
-endif # TARGET_MD_ARCH
-else
-	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
-endif
-else
-	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
-endif
-	@rm -f foodummyfilefoo $(SUB_LOBJS)
+endif # SHARED_LIBRARY_LIBS
+endif # NO_LD_ARCHIVE_FLAGS
+	$(MKSHLIB) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
+	@rm -f foodummyfilefoo $(SUB_SHLOBJS)
 else
 	@touch no-such-file.vms; rm -f no-such-file.vms $(SUB_LOBJS)
 ifndef IS_COMPONENT
@@ -745,13 +748,6 @@ endif
 endif
 	chmod +x $@
 	$(MOZ_POST_DSO_LIB_COMMAND) $@
-else
-$(SHARED_LIBRARY): $(OBJS) $(DEF_FILE) Makefile Makefile.in
-	rm -f $@
-	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
-	chmod +x $@
-	$(MOZ_POST_DSO_LIB_COMMAND) $@
-endif
 
 ifeq ($(OS_ARCH),OS2)
 $(DLL): $(OBJS) $(EXTRA_LIBS)

configure

@@ -3894,8 +3894,8 @@ fi
 _COMPILER_PREFIX=
 
 if test "$GNU_CC"; then
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
@@ -3915,8 +3915,8 @@ if test "$GNU_CC"; then
     _DEFINES_CFLAGS='-include $(DEPTH)/config-defs.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 else
-    MKSHLIB='$(LD) $(DSO_LDOPTS)'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-shared -h $@'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC'
@@ -4101,8 +4101,8 @@ case "$target" in
         DLL_SUFFIX='_shr.a'
         ;;
     esac
-    MKSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS)'
-    MKCSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS)'
+    MKSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS) -o $@'
     cat >> confdefs.h <<\EOF
 #define NSCAP_DISABLE_DEBUG_PTR_TYPES 1
 EOF
@@ -4110,7 +4110,7 @@ EOF
     ;;
 
 *-beos*)
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-nostart -Wl,-h -Wl,$@'
     TK_LIBS='-lbe -lroot'
     MOZ_TIMER_LIBS='$(DIST)/lib/libtimer_beos.so'
@@ -4154,15 +4154,15 @@ EOF
 *-hpux*)
     DLL_SUFFIX=".sl"
     if test ! "$GNU_CC"; then
-	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
-	DSO_CFLAGS=""
-	DSO_PIC_CFLAGS="+Z"
-	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
+    	DSO_CFLAGS=""
+    	DSO_PIC_CFLAGS="+Z"
+    	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+    	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     else
-	DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
-	MKSHLIB='$(LD) $(DSO_LDOPTS)'
-	MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+    	DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
+    	MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+    	MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
     fi
     MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
     cat >> confdefs.h <<\EOF
@@ -4188,8 +4188,8 @@ EOF
 EOF
 
     DSO_LDOPTS='-elf -shared'
-    MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_LDOPTS)'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     if test "$GNU_CC"; then
        MKSHLIB_FORCE_ALL='-Wl,-all'
        MKSHLIB_UNFORCE_ALL='-Wl,-none'
@@ -4305,8 +4305,8 @@ EOF
 						NEED_BASE_DLL_NAME_ALSO=1
 		;;
 	*86)
-		MKSHLIB='$(LD) $(DSO_LDOPTS)'
-		MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+		MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+		MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
 		;;
     esac
         if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
@@ -4328,8 +4328,8 @@ EOF
     DSO_LDOPTS="-M $DSO_LDOPTS"
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS="-shared -Wc,-fPIC -DPIC"
-    MKSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS)'
-    MKCSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS)'
+    MKSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS) -o $@'
     AR='qcc -Vgcc_ntox86'
     AR_FLAGS='-M -a $@'
     AR_LIST='ar t'
@@ -4351,8 +4351,8 @@ EOF
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -h $@'
-    MKSHLIB='$(LD) $(DSO_LDOPTS)'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
     if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
 	DSO_LDOPTS="-Bshareable /usr/lib/c++rt0.o"
     fi
@@ -4456,8 +4456,8 @@ alpha*-*-osf*)
 	DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@'
 	DSO_CFLAGS=
 	DSO_PIC_CFLAGS=
-	MKSHLIB='-$(LD) $(DSO_LDOPTS)'
-	MKCSHLIB='-$(LD) $(DSO_LDOPTS)'
+	MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
+	MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
 	MKSHLIB_FORCE_ALL='-all'
 	MKSHLIB_UNFORCE_ALL='-none'
 		cat >> confdefs.h <<\EOF
@@ -4521,8 +4521,8 @@ EOF
     TK_LIBS='/System/Library/Frameworks/Carbon.framework/Carbon'
     CFLAGS="$CFLAGS -traditional-cpp -fno-common -I/System/Library/Frameworks/Carbon.framework/Headers"
     CXXFLAGS="$CXXFLAGS -traditional-cpp -fno-common -I/System/Library/Frameworks/Carbon.framework/Headers"
-    MKSHLIB='$(CXX) $(CXXFLAGS) -arch ppc $(DSO_LDOPTS)'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CXX) $(CXXFLAGS) -arch ppc $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     MKSHLIB_FORCE_ALL=''
     MKSHLIB_UNFORCE_ALL=''
     ;;
@@ -4554,8 +4554,8 @@ EOF
 EOF
 
        LDFLAGS='-xildoff'
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL=''
        DSO_LDOPTS='-G -h $@'
@@ -4580,8 +4580,8 @@ EOF
            ;;
        esac
     else
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
        DSO_LDOPTS='-G -h $@'
        _WARNINGS_CFLAGS=''
        _WARNINGS_CXXFLAGS=''
@@ -4602,8 +4602,8 @@ EOF
 
 *-sunos*) 
     DSO_LDOPTS='-Bdynamic'
-    MKSHLIB='-$(LD) $(DSO_LDOPTS)'
-    MKCSHLIB='-$(LD) $(DSO_LDOPTS)'
+    MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
     cat >> confdefs.h <<\EOF
 #define SUNOS4 1
 EOF
@@ -10253,7 +10253,7 @@ if test "${enable_wrap_malloc+set}" = set; then
   if test "$enableval" = "yes"; then
      if test "$GNU_CC"; then
       WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc"
-      MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS)'
+      MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS) -o $@'
     fi
   elif test "$enableval" = "no"; then
     :
@@ -11809,10 +11809,10 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 if test ! "$MOZ_NATIVE_NSPR" && test -z "$USE_NSPR_AUTOCONF"
 then
-  rm -f ${srcdir}/nsprpub/config/my_config.mk
-  rm -f ${srcdir}/nsprpub/config/my_overrides.mk
-  cp build/unix/nspr_my_config.mk ${srcdir}/nsprpub/config/my_config.mk
-  cp build/unix/nspr_my_overrides.mk ${srcdir}/nsprpub/config/my_overrides.mk
+  rm -f ${MOZ_BUILD_ROOT}/nsprpub/config/my_config.mk
+  rm -f ${MOZ_BUILD_ROOT}/nsprpub/config/my_overrides.mk
+  cp ${srcdir}/build/unix/nspr_my_config.mk ${MOZ_BUILD_ROOT}/nsprpub/config/my_config.mk
+  cp ${srcdir}/build/unix/nspr_my_overrides.mk ${MOZ_BUILD_ROOT}/nsprpub/config/my_overrides.mk
 fi
 
 CC="$_SUBDIR_CC" 

configure.in

@@ -382,8 +382,8 @@ dnl ========================================================
 dnl GNU specific defaults
 dnl ========================================================
 if test "$GNU_CC"; then
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
@@ -404,8 +404,8 @@ if test "$GNU_CC"; then
     _DEFINES_CFLAGS='-include $(DEPTH)/config-defs.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 else
-    MKSHLIB='$(LD) $(DSO_LDOPTS)'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-shared -h $@'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC'
@@ -533,13 +533,13 @@ case "$target" in
         DLL_SUFFIX='_shr.a'
         ;;
     esac
-    MKSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS)'
-    MKCSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS)'
+    MKSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS) -o $@'
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
 *-beos*)
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-nostart -Wl,-h -Wl,$@'
     TK_LIBS='-lbe -lroot'
     MOZ_TIMER_LIBS='$(DIST)/lib/libtimer_beos.so'
@@ -584,15 +584,15 @@ case "$target" in
 *-hpux*)
     DLL_SUFFIX=".sl"
     if test ! "$GNU_CC"; then
-	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
-	DSO_CFLAGS=""
-	DSO_PIC_CFLAGS="+Z"
-	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
+    	DSO_CFLAGS=""
+    	DSO_PIC_CFLAGS="+Z"
+    	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+    	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     else
-	DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
-	MKSHLIB='$(LD) $(DSO_LDOPTS)'
-	MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+    	DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
+    	MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+    	MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
     fi
     MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
@@ -613,8 +613,8 @@ case "$target" in
     dnl What about IRIX 6.2?
     AC_DEFINE(IRIX6_3)
     DSO_LDOPTS='-elf -shared'
-    MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_LDOPTS)'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     if test "$GNU_CC"; then
        MKSHLIB_FORCE_ALL='-Wl,-all'
        MKSHLIB_UNFORCE_ALL='-Wl,-none'
@@ -700,8 +700,8 @@ case "$target" in
 		NEED_BASE_DLL_NAME_ALSO=1
 		;;
 	*86)
-		MKSHLIB='$(LD) $(DSO_LDOPTS)'
-		MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+		MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+		MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
 		;;
     esac
     dnl Test for a.out platform and handle C++ libraries correctly
@@ -724,8 +724,8 @@ case "$target" in
     DSO_LDOPTS="-M $DSO_LDOPTS"
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS="-shared -Wc,-fPIC -DPIC"
-    MKSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS)'
-    MKCSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS)'
+    MKSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS) -o $@'
     AR='qcc -Vgcc_ntox86'
     AR_FLAGS='-M -a $@'
     AR_LIST='ar t'
@@ -747,8 +747,8 @@ case "$target" in
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -h $@'
-    MKSHLIB='$(LD) $(DSO_LDOPTS)'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
     if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
 	DSO_LDOPTS="-Bshareable /usr/lib/c++rt0.o"
     fi
@@ -832,8 +832,8 @@ alpha*-*-osf*)
 	DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@'
 	DSO_CFLAGS=
 	DSO_PIC_CFLAGS=
-	MKSHLIB='-$(LD) $(DSO_LDOPTS)'
-	MKCSHLIB='-$(LD) $(DSO_LDOPTS)'
+	MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
+	MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
 	MKSHLIB_FORCE_ALL='-all'
 	MKSHLIB_UNFORCE_ALL='-none'
 	dnl Might fix the libxpcom.so breakage on this platform as well....
@@ -869,8 +869,8 @@ alpha*-*-osf*)
     TK_LIBS='/System/Library/Frameworks/Carbon.framework/Carbon'
     CFLAGS="$CFLAGS -traditional-cpp -fno-common -I/System/Library/Frameworks/Carbon.framework/Headers"
     CXXFLAGS="$CXXFLAGS -traditional-cpp -fno-common -I/System/Library/Frameworks/Carbon.framework/Headers"
-    MKSHLIB='$(CXX) $(CXXFLAGS) -arch ppc $(DSO_LDOPTS)'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+    MKSHLIB='$(CXX) $(CXXFLAGS) -arch ppc $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
     MKSHLIB_FORCE_ALL=''
     MKSHLIB_UNFORCE_ALL=''
     ;;
@@ -891,8 +891,8 @@ dnl the qsort routine under solaris is faulty
     if test -z "$GNU_CC"; then
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
        LDFLAGS='-xildoff'
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL=''
        DSO_LDOPTS='-G -h $@'
@@ -914,8 +914,8 @@ dnl the qsort routine under solaris is faulty
            ;;
        esac
     else
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS)'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS)'
+       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
        DSO_LDOPTS='-G -h $@'
        _WARNINGS_CFLAGS=''
        _WARNINGS_CXXFLAGS=''
@@ -930,8 +930,8 @@ dnl the qsort routine under solaris is faulty
 
 *-sunos*) 
     DSO_LDOPTS='-Bdynamic'
-    MKSHLIB='-$(LD) $(DSO_LDOPTS)'
-    MKCSHLIB='-$(LD) $(DSO_LDOPTS)'
+    MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
+    MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
     AC_DEFINE(SUNOS4)
     AC_DEFINE(SPRINTF_RETURNS_STRING)
     case "$(target_os)" in
@@ -3006,7 +3006,7 @@ MOZ_ARG_ENABLE_BOOL(wrap-malloc,
 [  --enable-wrap-malloc    Wrap malloc calls (gnu linker only) (default=no) ],
   [ if test "$GNU_CC"; then
       WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc"
-      MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS)'
+      MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS) -o $@'
     fi])
 
 MOZ_ARG_WITH_STRING(wrap-malloc,
@@ -3802,10 +3802,10 @@ dnl =
 dnl ========================================================
 if test ! "$MOZ_NATIVE_NSPR" && test -z "$USE_NSPR_AUTOCONF"
 then
-  rm -f ${srcdir}/nsprpub/config/my_config.mk
-  rm -f ${srcdir}/nsprpub/config/my_overrides.mk
-  cp build/unix/nspr_my_config.mk ${srcdir}/nsprpub/config/my_config.mk
-  cp build/unix/nspr_my_overrides.mk ${srcdir}/nsprpub/config/my_overrides.mk
+  rm -f ${MOZ_BUILD_ROOT}/nsprpub/config/my_config.mk
+  rm -f ${MOZ_BUILD_ROOT}/nsprpub/config/my_overrides.mk
+  cp ${srcdir}/build/unix/nspr_my_config.mk ${MOZ_BUILD_ROOT}/nsprpub/config/my_config.mk
+  cp ${srcdir}/build/unix/nspr_my_overrides.mk ${MOZ_BUILD_ROOT}/nsprpub/config/my_overrides.mk
 fi
 
 dnl ========================================================

db/mork/build/Makefile.in

@@ -40,9 +40,6 @@ EXPORTS		= \
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(MOZ_COMPONENT_LIBS) \
@@ -50,5 +47,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

docshell/build/Makefile.in

@@ -38,9 +38,6 @@ SHARED_LIBRARY_LIBS= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-lmozjs \
 		-ljsdom \
@@ -55,5 +52,3 @@ INCLUDES	+= \
 		-I$(srcdir)/../base		\
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

dom/src/build/Makefile.in

@@ -48,9 +48,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_TIMER_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lmozjs \
@@ -61,5 +58,3 @@ include $(topsrcdir)/config/rules.mk
 CFLAGS		+= -D_IMPL_NS_DOM
 INCLUDES	+= -I$(srcdir)/../base
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

embedding/browser/build/Makefile.in

@@ -41,9 +41,6 @@ SHARED_LIBRARY_LIBS= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-ljsdom \
 		$(MOZ_COMPONENT_LIBS) \

embedding/browser/gtk/src/Makefile.in

@@ -38,9 +38,6 @@ EXPORTS		= \
 		gtkmozembed.h
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgtksuperwin \
 		$(NULL)

embedding/browser/gtk/tests/Makefile.in

@@ -31,9 +31,6 @@ CPPSRCS		= \
 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
 
 LIBS		= \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgtkembedmoz \
 		-lgtksuperwin \

extensions/wallet/build/Makefile.in

@@ -48,13 +48,8 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

gfx/src/Makefile.in

@@ -84,15 +84,11 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
 		$(MOZ_TIMER_LIBS) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
 DEFINES		+= -D_IMPL_NS_GFX
 

layout/build/Makefile.in

@@ -91,9 +91,6 @@ SHARED_LIBRARY_LIBS += \
 endif
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		$(EXTRA_DSO_LIBS) \
@@ -116,8 +113,6 @@ ifdef MOZ_MATHML
 INCLUDES += -I$(srcdir)/../mathml/content/src
 endif
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-
 $(BUILD_DATE):	FORCE
 	$(RM) $@
 	$(PERL) $(srcdir)/gbdate.pl > $@

mailnews/absync/build/Makefile.in

@@ -38,9 +38,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(XPCOM_LIBS) \
@@ -51,4 +48,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile

mailnews/addrbook/build/Makefile.in

@@ -38,9 +38,6 @@ SHARED_LIBRARY_LIBS = \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
 	$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
 	-L$(DIST)/bin \
 	$(MOZ_COMPONENT_LIBS) \
@@ -48,5 +45,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/base/build/Makefile.in

@@ -45,9 +45,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/lib	\
 		$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
 		$(MOZ_TIMER_LIBS) \
@@ -59,5 +56,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/compose/build/Makefile.in

@@ -45,9 +45,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(EXTRA_DSO_LIBS) \
@@ -57,5 +54,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/db/msgdb/build/Makefile.in

@@ -42,9 +42,6 @@ EXPORTS		= nsMsgDBCID.h
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgdb_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(EXTRA_DSO_LIBS) \
@@ -53,5 +50,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/imap/build/Makefile.in

@@ -38,9 +38,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(XPCOM_LIBS) \
@@ -51,5 +48,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/local/build/Makefile.in

@@ -45,9 +45,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/lib \
 		$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
 		-L$(DIST)/bin \
@@ -57,5 +54,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/mime/build/Makefile.in

@@ -44,9 +44,6 @@ SHARED_LIBRARY_LIBS = \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS = \
-                $(MKSHLIB_FORCE_ALL) \
-                $(SHARED_LIBRARY_LIBS) \
-                $(MKSHLIB_UNFORCE_ALL) \
                 -L$(DIST)/bin \
                 -L$(DIST)/lib \
 		        $(EXTRA_DSO_LIBS) \
@@ -55,4 +52,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile

mailnews/mime/emitters/build/Makefile.in

@@ -39,14 +39,9 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mailnews/news/build/Makefile.in

@@ -44,9 +44,6 @@ EXTRA_DSO_LIBS += msgbaseutil
 endif
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(EXTRA_DSO_LIBS) \
@@ -56,5 +53,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

netwerk/build/Makefile.in

@@ -45,13 +45,8 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

netwerk/cache/build/Makefile.in

@@ -44,13 +44,8 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

rdf/brprof/build/Makefile.in

@@ -36,15 +36,8 @@ REQUIRES	= xpcom
 
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libbrprof_s.$(LIB_SUFFIX)
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL)
-
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/directory.rdf $(DIST)/bin/res/samples
 

rdf/build/Makefile.in

@@ -50,9 +50,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		$(EXTRA_DSO_LIBS) \
@@ -68,5 +65,3 @@ INCLUDES	+= \
 		-I$(srcdir)/../datasource/src \
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

rdf/chrome/build/Makefile.in

@@ -39,9 +39,6 @@ LOCAL_INCLUDES	= -I$(srcdir)/../src
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libchrome_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
@@ -51,5 +48,3 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

tools/leaky/Makefile.in

@@ -86,10 +86,10 @@ clean::
 
 $(LIBMALLOC): $(LIBMALLOC_OBJECTS)
 	rm -f $@
-	$(MKSHLIB) -o $@ $(LIBMALLOC_OBJECTS)
+	$(MKSHLIB) $(LIBMALLOC_OBJECTS)
 
 $(LIBPRELOAD): $(LIBPRELOAD_OBJECTS)
-	$(MKSHLIB) -o $@ $(LIBPRELOAD_OBJECTS)
+	$(MKSHLIB) $(LIBPRELOAD_OBJECTS)
 
 test:
 	@echo LIBMALLOC = $(LIBMALLOC)

uriloader/build/Makefile.in

@@ -38,9 +38,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/lib	\
 		-L$(DIST)/bin \
 		$(MOZ_COMPONENT_LIBS) \
@@ -48,5 +45,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

uriloader/extprotocol/base/Makefile.in

@@ -48,5 +48,3 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-# $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/beos/Makefile.in

@@ -62,9 +62,6 @@ SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
 
 EXTRA_DSO_LDOPTS = \
 		$(TOOLKIT_DSO_LDOPTS) \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lraptorgfx \
@@ -77,5 +74,3 @@ DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
 
 CXXFLAGS	+= $(TK_CFLAGS)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/build/Makefile.in

@@ -43,9 +43,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(TOOLKIT_LIBS) \
 		$(XLDFLAGS) \
 		$(XLIBS) \
@@ -57,5 +54,3 @@ CXXFLAGS	+= $(TK_CFLAGS)
 
 DEFINES		+= -D_IMPL_NS_WIDGET
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/gtk/Makefile.in

@@ -60,9 +60,6 @@ CPPSRCS		= \
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lraptorgfx \
 		$(MOZ_TIMER_LIBS) \
@@ -105,8 +102,6 @@ INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-
 ICON_FILES	= \
 		$(srcdir)/mozicon50.xpm \
 		$(srcdir)/mozicon16.xpm \

widget/src/gtksuperwin/Makefile.in

@@ -32,12 +32,6 @@ CSRCS           = \
                 gtkmozbox.c
 
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
-
 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
 else
@@ -66,5 +60,3 @@ INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/gtkxtbin/Makefile.in

@@ -33,12 +33,6 @@ REQUIRES	= gtkxtbin
 CSRCS           = \
                 gtkxtbin.c \
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
-
 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
 else
@@ -65,5 +59,3 @@ INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/motif/Makefile.in

@@ -59,12 +59,6 @@ CPPSRCS		= \
 
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
-
 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_MOTIF_LDFLAGS)
 else
@@ -86,5 +80,3 @@ INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/os2/Makefile.in

@@ -86,5 +86,3 @@ DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
 
 CXXFLAGS	+= $(TK_CFLAGS)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/photon/Makefile.in

@@ -68,9 +68,6 @@ SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
 
 EXTRA_DSO_LDOPTS = \
 		$(TOOLKIT_DSO_LDOPTS) \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(TK_LIBS) \
 		$(NULL)
 
@@ -80,5 +77,3 @@ DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
 
 CXXFLAGS	+= $(TK_CFLAGS)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/qt/Makefile.in

@@ -76,12 +76,6 @@ MOCSRCS		= \
 
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
-
 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(MOZ_QT_LDFLAGS) -lxlibrgb $(MOZ_XLIB_LDFLAGS)
 else
@@ -100,5 +94,3 @@ DEFINES		+= -D_IMPL_NS_WIDGET
 
 INCLUDES	+= -I$(srcdir)/../xpwidgets -I$(srcdir)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/src/xlib/Makefile.in

@@ -60,12 +60,6 @@ CPPSRCS		= \
 
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
-
 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
 else
@@ -91,5 +85,3 @@ INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

widget/timer/src/mac/Makefile.in

@@ -35,7 +35,6 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_TIMER
 EXTRA_DSO_LDOPTS+= \
-                $(SHARED_LIBRARY_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)

xpcom/appshell/eventloop/photon/Makefile.in

@@ -47,9 +47,6 @@ SHARED_LIBRARY_LIBS = ../xp/libxp_eventloop.a
 
 EXTRA_DSO_LDOPTS = \
 		$(TOOLKIT_DSO_LDOPTS) \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		$(TK_LIBS) \
 		$(NULL)
 
@@ -57,5 +54,3 @@ include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(TK_CFLAGS)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

xpcom/appshell/nativeApp/Makefile.in

@@ -55,5 +55,3 @@ LOCAL_INCLUDES	+= -I../$(MOZ_WIDGET_TOOLKIT)
 CXXFLAGS	+= $(TK_CFLAGS)
 endif
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

xpcom/build/Makefile.in

@@ -55,13 +55,6 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../proxy/src \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		-L$(DIST)/lib \
-		$(NULL)
-
 ifdef MOZ_DEMANGLE_SYMBOLS
 EXTRA_DSO_LDOPTS += -liberty
 endif
@@ -80,5 +73,3 @@ endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-