Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Side by Side Diff: net/third_party/nss/ssl/Makefile

Issue 3177012: Update to NSS 3.12.7. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/README.chromium ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #! gmake 1 #! gmake
2 # 2 #
3 # ***** BEGIN LICENSE BLOCK ***** 3 # ***** BEGIN LICENSE BLOCK *****
4 # Version: MPL 1.1/GPL 2.0/LGPL 2.1 4 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
5 # 5 #
6 # The contents of this file are subject to the Mozilla Public License Version 6 # The contents of this file are subject to the Mozilla Public License Version
7 # 1.1 (the "License"); you may not use this file except in compliance with 7 # 1.1 (the "License"); you may not use this file except in compliance with
8 # the License. You may obtain a copy of the License at 8 # the License. You may obtain a copy of the License at
9 # http://www.mozilla.org/MPL/ 9 # http://www.mozilla.org/MPL/
10 # 10 #
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 CSRCS += win32err.c 64 CSRCS += win32err.c
65 DEFINES += -DIN_LIBSSL 65 DEFINES += -DIN_LIBSSL
66 else 66 else
67 ifeq ($(OS_TARGET),OS2) 67 ifeq ($(OS_TARGET),OS2)
68 CSRCS += os2_err.c 68 CSRCS += os2_err.c
69 else 69 else
70 CSRCS += unix_err.c 70 CSRCS += unix_err.c
71 endif 71 endif
72 endif 72 endif
73 73
74 ifdef USE_SYSTEM_ZLIB
75 DEFINES += -DNSS_ENABLE_ZLIB
76 EXTRA_LIBS += $(ZLIB_LIBS)
77 endif
78
79 ####################################################################### 74 #######################################################################
80 # (5) Execute "global" rules. (OPTIONAL) # 75 # (5) Execute "global" rules. (OPTIONAL) #
81 ####################################################################### 76 #######################################################################
82 77
83 include $(CORE_DEPTH)/coreconf/rules.mk 78 include $(CORE_DEPTH)/coreconf/rules.mk
84 79
85 ####################################################################### 80 #######################################################################
86 # (6) Execute "component" rules. (OPTIONAL) # 81 # (6) Execute "component" rules. (OPTIONAL) #
87 ####################################################################### 82 #######################################################################
88 83
89 84
90 85
91 ####################################################################### 86 #######################################################################
92 # (7) Execute "local" rules. (OPTIONAL). # 87 # (7) Execute "local" rules. (OPTIONAL). #
93 ####################################################################### 88 #######################################################################
94 89
95 export:: private_export 90 export:: private_export
96 91
97 # indicates dependency on freebl static lib 92 # indicates dependency on freebl static lib
98 $(SHARED_LIBRARY): $(CRYPTOLIB) 93 $(SHARED_LIBRARY): $(CRYPTOLIB)
OLDNEW
« no previous file with comments | « net/third_party/nss/README.chromium ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698