--- a/intl/unicharutil/tests/Makefile.in+++ b/intl/unicharutil/tests/Makefile.in@@ -1,11 +1,8 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \- $(DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \- $(XPCOM_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL)

--- a/ipc/ipdl/test/cxx/app/Makefile.in+++ b/ipc/ipdl/test/cxx/app/Makefile.in@@ -1,15 +1,13 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. NSDISTMODE = copy-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(LIBXUL_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk

--- a/js/src/gdb/Makefile.in+++ b/js/src/gdb/Makefile.in@@ -1,15 +1,15 @@ # -*- Mode: makefile -*- # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)+LIBS += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) ifdef MOZ_SHARED_ICU EXTRA_LIBS += $(MOZ_ICU_LIBS) endif EXTRA_LIBS += $(MOZ_FFI_LIBS) # Place a GDB Python auto-load file next to the gdb-tests executable, both

--- a/js/src/moz.build+++ b/js/src/moz.build@@ -2,38 +2,39 @@ # vim: set filetype=python: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG['DEHYDRA_PATH']: DIRS += ['analysis-tests']-if CONFIG['JS_NATIVE_EDITLINE']:+if CONFIG['JS_BUNDLED_EDITLINE']: DIRS += ['editline'] # editline needs to get built before the shell if not CONFIG['JS_DISABLE_SHELL']: DIRS += ['shell'] TEST_DIRS += ['jsapi-tests', 'tests', 'gdb'] LOCAL_INCLUDES += ['../../mfbt/double-conversion']-LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']- CONFIGURE_SUBST_FILES += [ 'devtools/rootAnalysis/Makefile', 'js-confdefs.h', 'js-config', 'js.pc', ] if CONFIG['JS_STANDALONE']: DEFINES['IMPL_MFBT'] = True+ USE_LIBS += [+ 'mfbt',+ ] else: CONFIGURE_SUBST_FILES += [ '../../config/autoconf-js.mk', '../../config/emptyvars-js.mk', ] CONFIGURE_DEFINE_FILES += [ 'js-config.h',@@ -421,23 +422,31 @@ HOST_SIMPLE_PROGRAMS += [ # JavaScript must be built shared, even for static builds, as it is used by # other modules which are always built shared. Failure to do so results in # the js code getting copied into xpinstall and jsd as well as mozilla-bin, # and then the static data cells used for locking no longer work. # # In fact, we now build both a static and a shared library, as the # JS shell would like to link to the static library.+LIBRARY_NAME = 'js'+ if CONFIG['JS_SHARED_LIBRARY']: FORCE_SHARED_LIB = True+ SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] SDK_LIBRARY = True FORCE_STATIC_LIB = True STATIC_LIBRARY_NAME = 'js_static'+if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:+ USE_LIBS += [+ 'mozz',+ ]+ if CONFIG['MOZ_ETW']: GENERATED_FILES = [ 'ETWProvider.h', ] # This will get the ETW provider resources into the library mozjs.dll RESFILE = 'ETWProvider.res' if CONFIG['NIGHTLY_BUILD']:

--- a/js/xpconnect/tests/Makefile.in+++ b/js/xpconnect/tests/Makefile.in@@ -1,9 +1,8 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(MOZ_COMPONENT_LIBS) \+LIBS += \+ $(NSPR_LIBS) \ $(NULL)

--- a/layout/media/Makefile.in+++ b/layout/media/Makefile.in@@ -1,15 +1,15 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. ifeq (WINNT,$(OS_TARGET))-EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) OS_LIBS += $(call EXPAND_LIBNAME,usp10 ole32) endif include $(topsrcdir)/config/rules.mk ifeq (WINNT,$(OS_TARGET)) symbols.def: symbols.def.in $(GLOBAL_DEPS) $(call py_action,preprocessor,$(ACDEFINES) $< -o $@)

--- a/layout/media/moz.build+++ b/layout/media/moz.build@@ -3,14 +3,17 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. LIBRARY_NAME = 'gkmedias' if CONFIG['GKMEDIAS_SHARED_LIBRARY']: FORCE_SHARED_LIB = True+ USE_LIBS += [+ 'mozalloc',+ ] if CONFIG['MOZ_WEBRTC']: DIRS += ['webrtc'] if CONFIG['OS_TARGET'] == 'WINNT': DEFFILE = 'symbols.def'

deleted file mode 100644--- a/media/omx-plugin/froyo/Makefile.in+++ /dev/null@@ -1,25 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- -L$(DEPTH)/media/omx-plugin/lib/froyo/libstagefright \- -lstagefright \- -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \- -lstagefright_color_conversion \- $(NULL)-

deleted file mode 100644--- a/media/omx-plugin/gb/Makefile.in+++ /dev/null@@ -1,25 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright \- -lstagefright \- -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \- -lstagefright_color_conversion \- $(NULL)-

deleted file mode 100644--- a/media/omx-plugin/gb235/Makefile.in+++ /dev/null@@ -1,25 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- -L$(DEPTH)/media/omx-plugin/lib/gb235/libstagefright \- -lstagefright \- -L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \- -lstagefright_color_conversion \- $(NULL)-

deleted file mode 100644--- a/media/omx-plugin/hc/Makefile.in+++ /dev/null@@ -1,23 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- -L$(DEPTH)/media/omx-plugin/lib/hc/libstagefright \- -lstagefright \- $(NULL)-

deleted file mode 100644--- a/media/omx-plugin/kk/Makefile.in+++ /dev/null@@ -1,25 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/ics/libutils \- -lutils \- -L$(DEPTH)/media/omx-plugin/lib/ics/libstagefright \- -lstagefright \- -L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \- -lvideoeditorplayer \- $(NULL)-

deleted file mode 100644--- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in+++ /dev/null@@ -1,20 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- $(NULL)

deleted file mode 100644--- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in+++ /dev/null@@ -1,20 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- $(NULL)

deleted file mode 100644--- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in+++ /dev/null@@ -1,20 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- $(NULL)

deleted file mode 100644--- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in+++ /dev/null@@ -1,20 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \- -lutils \- $(NULL)

deleted file mode 100644--- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in+++ /dev/null@@ -1,20 +0,0 @@-# Copyright 2012 Mozilla Foundation and Mozilla contributors-#-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.--include $(topsrcdir)/config/rules.mk--EXTRA_DSO_LDOPTS += \- -L$(DEPTH)/media/omx-plugin/lib/ics/libutils \- -lutils \- $(NULL)

--- a/memory/build/Makefile.in+++ b/memory/build/Makefile.in@@ -1,16 +1,8 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. STLFLAGS = ifdef MOZ_GLUE_PROGRAM_LDFLAGS DIST_INSTALL = 1 endif--ifdef MOZ_JEMALLOC3-ifndef MOZ_NATIVE_JEMALLOC-SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)-endif-else-SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)-endif

--- a/memory/replace/jemalloc/Makefile.in+++ b/memory/replace/jemalloc/Makefile.in@@ -1,8 +1,6 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)- MOZ_GLUE_LDFLAGS = # Don't link against mozglue WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap

--- a/mfbt/tests/Makefile.in+++ b/mfbt/tests/Makefile.in@@ -6,11 +6,12 @@ # not available to MFBT, we have to reset these MOZ_GLUE*_LDFLAGS before including it # and LIBS_ after including it. For WRAP_LDFLAGS, it shouldn't matter. # See later comments in bug 732875. MOZ_GLUE_PROGRAM_LDFLAGS= MOZ_GLUE_LDFLAGS = WRAP_LDFLAGS=-include $(topsrcdir)/config/rules.mk+# Prevent those tests linking against libxpcom, libxul, and nspr.+NSPR_LIBS=-LIBS= $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)+include $(topsrcdir)/config/rules.mk

--- a/mozglue/tests/Makefile.in+++ b/mozglue/tests/Makefile.in@@ -1,18 +1,16 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. ifdef MOZ_LINKER # Only link against the linker, not mozglue MOZ_GLUE_PROGRAM_LDFLAGS = MOZ_GLUE_LDFLAGS =-LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker)- EXTRA_LIBS = $(MOZ_ZLIB_LIBS) endif include $(topsrcdir)/config/rules.mk ifdef MOZ_LINKER check:: @$(EXIT_ON_ERROR) ./TestZip$(BIN_SUFFIX) $(srcdir)

--- a/netwerk/streamconv/test/Makefile.in+++ b/netwerk/streamconv/test/Makefile.in@@ -1,12 +1,10 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(XPCOM_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk

--- a/netwerk/test/Makefile.in+++ b/netwerk/test/Makefile.in@@ -1,17 +1,17 @@ # vim: noexpandtab ts=8 sw=8 # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = $(XPCOM_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL) DEFINES += $(TK_CFLAGS) include $(topsrcdir)/config/rules.mk check::

--- a/rdf/tests/rdfcat/Makefile.in+++ b/rdf/tests/rdfcat/Makefile.in@@ -1,14 +1,12 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(XPCOM_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS)

--- a/rdf/tests/rdfcat/moz.build+++ b/rdf/tests/rdfcat/moz.build@@ -4,8 +4,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. PROGRAM = 'rdfcat' SOURCES += [ 'rdfcat.cpp', ]++USE_LIBS += [+ 'mozalloc',+ 'xpcomglue_s',+ 'xul-shared',+]

--- a/rdf/tests/rdfpoll/Makefile.in+++ b/rdf/tests/rdfpoll/Makefile.in@@ -1,10 +1,8 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(XPCOM_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL)

--- a/rdf/tests/rdfpoll/moz.build+++ b/rdf/tests/rdfpoll/moz.build@@ -4,8 +4,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. PROGRAM = 'rdfpoll' SOURCES += [ 'rdfpoll.cpp', ]++USE_LIBS += [+ 'mozalloc',+ 'xpcomglue_s',+ 'xul-shared',+]

--- a/rdf/tests/triplescat/Makefile.in+++ b/rdf/tests/triplescat/Makefile.in@@ -1,14 +1,12 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(XPCOM_LIBS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS)

--- a/rdf/tests/triplescat/moz.build+++ b/rdf/tests/triplescat/moz.build@@ -4,8 +4,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. PROGRAM = 'triplescat' SOURCES += [ 'triplescat.cpp', ]++USE_LIBS += [+ 'mozalloc',+ 'xpcomglue_s',+ 'xul-shared',+]

--- a/security/sandbox/win/src/sandboxbroker/Makefile.in+++ b/security/sandbox/win/src/sandboxbroker/Makefile.in@@ -1,12 +1,11 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # MOZ_GLUE_LDFLAGS = SHARED_LIBRARY_LIBS += \- ../../../$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX) \ $(NSPR_LIBS) \ $(NULL) OS_LIBS += $(call EXPAND_LIBNAME,dbghelp)

--- a/startupcache/test/Makefile.in+++ b/startupcache/test/Makefile.in@@ -1,6 +1,6 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS += $(MOZ_COMPONENT_LIBS)+LIBS += $(NSPR_LIBS)

--- a/storage/test/Makefile.in+++ b/storage/test/Makefile.in@@ -1,9 +1,9 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(MOZ_COMPONENT_LIBS) \+LIBS += \+ $(NSPR_LIBS) \ $(SQLITE_LIBS) \ $(NULL)

--- a/testing/mochitest/ssltunnel/Makefile.in+++ b/testing/mochitest/ssltunnel/Makefile.in@@ -1,10 +1,9 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. LIBS = \ $(NSPR_LIBS) \ $(NSS_LIBS) \- $(MOZALLOC_LIB) \ $(NULL)

deleted file mode 100644--- a/toolkit/components/places/tests/cpp/Makefile.in+++ /dev/null@@ -1,7 +0,0 @@-# This Source Code Form is subject to the terms of the Mozilla Public-# License, v. 2.0. If a copy of the MPL was not distributed with this file,-# You can obtain one at http://mozilla.org/MPL/2.0/. */--ifdef JS_SHARED_LIBRARY-LIBS += $(MOZ_JS_LIBS)-endif

--- a/toolkit/library/Makefile.in+++ b/toolkit/library/Makefile.in@@ -1,16 +1,12 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/.-ifeq ($(OS_ARCH),WINNT)- SHARED_LIBRARY_LIBS += ../../security/sandbox/win/src/sandboxbroker/$(LIB_PREFIX)sandboxbroker.$(LIB_SUFFIX)-endif- ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) endif include $(topsrcdir)/config/rules.mk .PHONY: gtestxul gtestxul:

--- a/toolkit/system/dbus/Makefile.in+++ b/toolkit/system/dbus/Makefile.in@@ -1,13 +1,12 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-EXTRA_DSO_LDOPTS = \- $(XPCOM_GLUE_LDOPTS) \+EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(MOZ_DBUS_GLIB_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)

--- a/webapprt/gtk/Makefile.in+++ b/webapprt/gtk/Makefile.in@@ -1,14 +1,13 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(XPCOM_STANDALONE_GLUE_LDOPTS) \+LIBS += \ $(TK_LIBS) \ $(NULL) NSDISTMODE = copy PROGRAMS_DEST = $(DIST)/bin include $(topsrcdir)/config/rules.mk

--- a/webapprt/win/Makefile.in+++ b/webapprt/win/Makefile.in@@ -1,20 +1,16 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. # Don't create a dependency on mozglue, which is impossible (difficult?) # to dynamically link into our executable, as we copy it to arbitrary locations. MOZ_GLUE_LDFLAGS =-LIBS = \- $(XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS) \- $(NULL)- ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG MOZ_WINCONSOLE = 1 else MOZ_WINCONSOLE = 0 endif endif

--- a/xpcom/reflect/xptcall/tests/Makefile.in+++ b/xpcom/reflect/xptcall/tests/Makefile.in@@ -1,9 +1,8 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(XPCOM_GLUE_LDOPTS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL)

--- a/xpcom/reflect/xptinfo/tests/Makefile.in+++ b/xpcom/reflect/xptinfo/tests/Makefile.in@@ -1,9 +1,8 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(XPCOM_GLUE_LDOPTS) \+LIBS += \ $(NSPR_LIBS) \ $(NULL)

--- a/xpcom/sample/Makefile.in+++ b/xpcom/sample/Makefile.in@@ -1,19 +1,17 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library # from this Makefile. We link against the "dependent glue" and against the # frozen XPCOM shared library.-EXTRA_DSO_LDOPTS = \- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \- $(XPCOM_FROZEN_LDOPTS) \+EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(NULL) # Need to link with CoreFoundation on Mac ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) EXTRA_DSO_LDOPTS += \ $(TK_LIBS) \ $(NULL)

--- a/xpcom/sample/program/Makefile.in+++ b/xpcom/sample/program/Makefile.in@@ -1,19 +1,11 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-# LIBS specifies linker flags when building an executable program from-# this Makefile. We link against the "standalone glue" which does not require-# that the application be linked against the XPCOM dynamic library or the NSPR-# dynamic libraries.-LIBS = \- $(XPCOM_STANDALONE_GLUE_LDOPTS) \- $(NULL)- # Need to link with CoreFoundation on Mac ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ $(TK_LIBS) \ $(NULL) endif

--- a/xpcom/sample/program/moz.build+++ b/xpcom/sample/program/moz.build@@ -13,8 +13,16 @@ SOURCES += [ # SIMPLE_PROGRAMS compiles a single .cpp file into an executable SIMPLE_PROGRAMS += [ 'nsTestSample' ] # Whatever code is going to be linked with the *standalone* glue must be # built with the XPCOM_GLUE define set. DEFINES['XPCOM_GLUE'] = True++# USE_LIBS specifies the in-tree libraries to link when building an executable+# program from this directory. We link against the "standalone glue" which does+# not require# that the application be linked against the XPCOM dynamic library+# or the NSPR dynamic libraries.+USE_LIBS += [+ 'xpcomglue',+]

--- a/xpcom/tests/Makefile.in+++ b/xpcom/tests/Makefile.in@@ -1,14 +1,12 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS += $(XPCOM_LIBS)- # Make sure we have symbols in case we need to debug these. MOZ_DEBUG_SYMBOLS = 1 include $(topsrcdir)/config/rules.mk ifneq (,$(SIMPLE_PROGRAMS)) libs:: $(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit

--- a/xpcom/tests/external/Makefile.in+++ b/xpcom/tests/external/Makefile.in@@ -1,10 +1,9 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk LIBS += \- $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL)

--- a/xpcom/typelib/xpt/tests/Makefile.in+++ b/xpcom/typelib/xpt/tests/Makefile.in@@ -1,13 +1,8 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-LIBS = \- $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \- $(XPCOM_LIBS) \- $(NULL)- include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_LIBXUL

--- a/xulrunner/examples/simple/components/src/Makefile.in+++ b/xulrunner/examples/simple/components/src/Makefile.in@@ -1,9 +1,8 @@ # vim:set ts=8 sw=8 sts=8 noet: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-EXTRA_DSO_LDOPTS = \- $(XPCOM_GLUE_LDOPTS) \+EXTRA_DSO_LDOPTS += \ $(NSPR_LIBS) \ $(NULL)

--- a/xulrunner/stub/Makefile.in+++ b/xulrunner/stub/Makefile.in@@ -1,19 +1,15 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Don't create a dependency on mozglue MOZ_GLUE_LDFLAGS =-LIBS = \- $(XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS) \- $(NULL)- # Need to link with CoreFoundation on Mac ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ $(TK_LIBS) \ $(NULL) endif ifndef MOZ_WINCONSOLE