← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/Makefile
58
58
# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
59
59
#######################################################################
60
60
 
61
 
ifeq ($(OS_TARGET), WINCE)
62
 
DIRS := $(filter-out fortcrypt,$(DIRS))
 
61
ifndef USE_SYSTEM_ZLIB
 
62
ZLIB_SRCDIR = zlib  # Add the zlib directory to DIRS.
63
63
endif
64
64
 
65
65
ifndef MOZILLA_CLIENT
66
66
ifndef NSS_USE_SYSTEM_SQLITE
67
 
DIRS := sqlite $(DIRS)
 
67
SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
 
68
endif
 
69
endif
 
70
 
 
71
ifndef MOZILLA_CLIENT
 
72
ifeq ($(OS_ARCH),Linux)
 
73
SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
68
74
endif
69
75
endif
70
76
 
84
90
# (7) Execute "local" rules. (OPTIONAL).                              #
85
91
#######################################################################
86
92
 
87
 
ifdef MOZILLA_SECURITY_BUILD
88
 
FILES=$(shell ls -d $(CORE_DEPTH)/../../ns/security/lib/crypto/*)
89
 
 
90
 
export::
91
 
        if test -d $(CORE_DEPTH)/../../ns/security/lib/crypto; then \
92
 
            $(NSINSTALL) -D crypto; \
93
 
            for file in $(FILES) ; do \
94
 
                if test -f $$file; then \
95
 
                    $(INSTALL) -m 444 $$file crypto; \
96
 
                fi; \
97
 
            done;  \
98
 
            $(INSTALL) -m 444 freebl/sha_fast.c crypto; \
99
 
            $(INSTALL) -m 444 freebl/sha_fast.h crypto; \
100
 
        fi
101
 
endif