The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/config/nspr/Makefile.in	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,44 @@
     1.4 +#
     1.5 +# This Source Code Form is subject to the terms of the Mozilla Public
     1.6 +# License, v. 2.0. If a copy of the MPL was not distributed with this
     1.7 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
     1.8 +
     1.9 +include $(topsrcdir)/config/rules.mk
    1.10 +
    1.11 +ifdef LIBXUL_SDK
    1.12 +$(error config/nspr/Makefile.in is not compatible with --enable-libxul-sdk=)
    1.13 +endif
    1.14 +ifdef MOZ_NATIVE_NSPR
    1.15 +$(error config/nspr/Makefile.in is not compatible with MOZ_NATIVE_NSPR)
    1.16 +endif
    1.17 +
    1.18 +# Copy NSPR to the SDK
    1.19 +ABS_DIST = $(abspath $(DIST))
    1.20 +
    1.21 +ifdef MOZ_FOLD_LIBS
    1.22 +# Trick the nspr build system into not building shared libraries.
    1.23 +# bug #851869.
    1.24 +EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=
    1.25 +
    1.26 +# Work around libVersionPoint conflict between all three libraries.
    1.27 +# See bug #838566.
    1.28 +EXTRA_MAKE_FLAGS += XP_DEFINE=-DlibVersionPoint='libVersionPoint$$(LIBRARY_NAME)'
    1.29 +else
    1.30 +# nspr's make export compiles and links everything, but linking can't happen
    1.31 +# during export on platforms where nspr is linked against mozcrt/mozglue.
    1.32 +export:: EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=
    1.33 +endif
    1.34 +
    1.35 +libs export clean distclean::
    1.36 +	$(MAKE) -C $(DEPTH)/nsprpub $@ $(EXTRA_MAKE_FLAGS)
    1.37 +
    1.38 +libs::
    1.39 +	$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include/nspr libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR= $(EXTRA_MAKE_FLAGS)
    1.40 +	$(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin
    1.41 +	$(RM) -rf $(DIST)/sdk/dummy
    1.42 +ifneq (,$(filter WINNT,$(OS_ARCH))) # {
    1.43 +	$(RM) -f $(DIST)/sdk/lib/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plds4$(DLL_SUFFIX)
    1.44 +	$(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4_s.$(LIB_SUFFIX)
    1.45 +else # } {
    1.46 +	$(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX)
    1.47 +endif # }