Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | # License, v. 2.0. If a copy of the MPL was not distributed with this file, |
michael@0 | 3 | # You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 4 | |
michael@0 | 5 | ifdef MOZ_CONTENT_SANDBOX |
michael@0 | 6 | ifeq ($(OS_ARCH),WINNT) |
michael@0 | 7 | SHARED_LIBRARY_LIBS += ../../security/sandbox/win/src/sandboxbroker/$(LIB_PREFIX)sandboxbroker.$(LIB_SUFFIX) |
michael@0 | 8 | endif |
michael@0 | 9 | endif |
michael@0 | 10 | |
michael@0 | 11 | # COMPONENT_LIBS is mosly useless since bug 935881, but is kept for |
michael@0 | 12 | # MOZ_APP_COMPONENT_LIBS, used by comm-central, and gtest linking. |
michael@0 | 13 | SHARED_LIBRARY_LIBS += \ |
michael@0 | 14 | $(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \ |
michael@0 | 15 | $(NULL) |
michael@0 | 16 | |
michael@0 | 17 | ifdef MOZ_APP_COMPONENT_LIBS |
michael@0 | 18 | COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS) |
michael@0 | 19 | endif |
michael@0 | 20 | |
michael@0 | 21 | ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
michael@0 | 22 | CXXFLAGS += $(TK_CFLAGS) |
michael@0 | 23 | endif |
michael@0 | 24 | |
michael@0 | 25 | include $(topsrcdir)/config/rules.mk |
michael@0 | 26 | |
michael@0 | 27 | .PHONY: gtestxul |
michael@0 | 28 | gtestxul: |
michael@0 | 29 | $(MAKE) -C gtest libs LINK_GTEST=1 |