security/nss/lib/ckfw/builtins/Makefile

Thu, 15 Jan 2015 21:03:48 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 15 Jan 2015 21:03:48 +0100
branch
TOR_BUG_9701
changeset 11
deefc01c0e14
permissions
-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

     1 # 
     2 # This Source Code Form is subject to the terms of the Mozilla Public
     3 # License, v. 2.0. If a copy of the MPL was not distributed with this
     4 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
     6 include manifest.mn
     7 include $(CORE_DEPTH)/coreconf/config.mk
     8 include config.mk
    10 EXTRA_LIBS = \
    11 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
    12 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
    13 	$(NULL)
    15 # can't do this in manifest.mn because OS_TARGET isn't defined there.
    16 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
    18 ifdef NS_USE_GCC
    19 EXTRA_SHARED_LIBS += \
    20 	-L$(NSPR_LIB_DIR) \
    21 	-lplc4 \
    22 	-lplds4 \
    23 	-lnspr4 \
    24 	$(NULL)
    25 else 
    26 EXTRA_SHARED_LIBS += \
    27         $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
    28         $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
    29         $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
    30         $(NULL)
    31 endif # NS_USE_GCC
    32 else
    34 EXTRA_SHARED_LIBS += \
    35 	-L$(NSPR_LIB_DIR) \
    36 	-lplc4 \
    37 	-lplds4 \
    38 	-lnspr4 \
    39 	$(NULL)
    40 endif
    43 include $(CORE_DEPTH)/coreconf/rules.mk
    45 # Generate certdata.c.
    47 # By default, use the unmodified certdata.txt.
    48 ifndef NSS_CERTDATA_TXT
    49 NSS_CERTDATA_TXT = certdata.txt
    50 endif
    52 $(OBJDIR)/certdata.c: $(NSS_CERTDATA_TXT) certdata.perl
    53 	@$(MAKE_OBJDIR)
    54 	$(PERL) certdata.perl < $(NSS_CERTDATA_TXT) > $@

mercurial