| 1 |
--- Makefile.in Tue Sep 14 16:59:40 2004 |
| 2 |
+++ Makefile.in Tue Aug 2 08:26:55 2005 |
| 3 |
@@ -102,6 +102,4 @@ |
| 4 |
# tier 1 - 3rd party individual libraries |
| 5 |
# |
| 6 |
-tier_1_dirs += dbm |
| 7 |
- |
| 8 |
ifndef MOZ_NATIVE_JPEG |
| 9 |
tier_1_dirs += jpeg |
| 10 |
--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 |
| 11 |
+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 |
| 12 |
@@ -124,19 +124,19 @@ |
| 13 |
pipboot \ |
| 14 |
$(NULL) |
| 15 |
|
| 16 |
-EXTRA_DEPS = $(NSS_DEP_LIBS) |
| 17 |
|
| 18 |
DEFINES += -DNSS_ENABLE_ECC |
| 19 |
|
| 20 |
# Use local includes because they are inserted before INCLUDES |
| 21 |
# so that Mozilla's nss.h is used, not glibc's |
| 22 |
-LOCAL_INCLUDES += $(NSS_CFLAGS) |
| 23 |
+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss |
| 24 |
|
| 25 |
EXTRA_DSO_LDOPTS += \ |
| 26 |
$(MOZ_UNICHARUTIL_LIBS) \ |
| 27 |
$(MOZ_COMPONENT_LIBS) \ |
| 28 |
$(MOZ_JS_LIBS) \ |
| 29 |
$(NSS_LIBS) \ |
| 30 |
+ $(LOCAL_INCLUDES) \ |
| 31 |
$(NULL) |
| 32 |
|
| 33 |
include $(topsrcdir)/config/rules.mk |
| 34 |
--- security/manager/Makefile.in.orig 2008-05-23 19:45:26.000000000 -0400 |
| 35 |
+++ security/manager/Makefile.in 2008-07-17 14:59:30.000000000 -0400 |
| 36 |
@@ -54,22 +54,13 @@ PACKAGE_VARS += \ |
| 37 |
SSL3_LIB \ |
| 38 |
SOFTOKEN3_LIB \ |
| 39 |
SOFTOKEN3_CHK \ |
| 40 |
- LOADABLE_ROOT_MODULE \ |
| 41 |
HAVE_FREEBL_LIBS \ |
| 42 |
HAVE_FREEBL_LIBS_32 \ |
| 43 |
HAVE_FREEBL_LIBS_32INT64 \ |
| 44 |
HAVE_FREEBL_LIBS_64 \ |
| 45 |
$(NULL) |
| 46 |
- |
| 47 |
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) |
| 48 |
endif |
| 49 |
|
| 50 |
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) |
| 51 |
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) |
| 52 |
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) |
| 53 |
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) |
| 54 |
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk |
| 55 |
- |
| 56 |
# Default |
| 57 |
HAVE_FREEBL_LIBS = 1 |
| 58 |
|
| 59 |
@@ -218,11 +209,6 @@ export:: .nss.cleaned |
| 60 |
.nss.cleaned: .nss.checkout |
| 61 |
ifndef MOZ_NATIVE_NSS |
| 62 |
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean |
| 63 |
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean |
| 64 |
-ifndef SKIP_CHK |
| 65 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean |
| 66 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean |
| 67 |
-endif |
| 68 |
touch $@ |
| 69 |
endif |
| 70 |
|
| 71 |
@@ -249,55 +235,6 @@ else |
| 72 |
cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) |
| 73 |
endif |
| 74 |
ifndef MOZ_NATIVE_NSS |
| 75 |
- $(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean |
| 76 |
- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export |
| 77 |
- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs |
| 78 |
- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs |
| 79 |
- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs |
| 80 |
- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean |
| 81 |
- # In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h. |
| 82 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export |
| 83 |
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins" |
| 84 |
-ifndef SKIP_CHK |
| 85 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) |
| 86 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) |
| 87 |
-endif |
| 88 |
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin |
| 89 |
-ifndef SKIP_CHK |
| 90 |
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin |
| 91 |
-endif |
| 92 |
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin |
| 93 |
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin |
| 94 |
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin |
| 95 |
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin |
| 96 |
-ifdef HAVE_FREEBL_LIBS |
| 97 |
-ifndef SKIP_CHK |
| 98 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin |
| 99 |
-endif |
| 100 |
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin |
| 101 |
-endif |
| 102 |
-ifdef HAVE_FREEBL_LIBS_32 |
| 103 |
-ifndef SKIP_CHK |
| 104 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin |
| 105 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin |
| 106 |
-endif |
| 107 |
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin |
| 108 |
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin |
| 109 |
-endif |
| 110 |
-ifdef HAVE_FREEBL_LIBS_32INT64 |
| 111 |
-ifndef SKIP_CHK |
| 112 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin |
| 113 |
-endif |
| 114 |
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin |
| 115 |
-endif |
| 116 |
-ifdef HAVE_FREEBL_LIBS_64 |
| 117 |
-ifndef SKIP_CHK |
| 118 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin |
| 119 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin |
| 120 |
-endif |
| 121 |
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin |
| 122 |
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin |
| 123 |
-endif |
| 124 |
endif |
| 125 |
$(MAKE) -C boot $@ |
| 126 |
$(MAKE) -C ssl $@ |
| 127 |
@@ -308,42 +245,6 @@ endif |
| 128 |
|
| 129 |
install:: |
| 130 |
ifndef MOZ_NATIVE_NSS |
| 131 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) |
| 132 |
-ifndef SKIP_CHK |
| 133 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) |
| 134 |
-endif |
| 135 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) |
| 136 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) |
| 137 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) |
| 138 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) |
| 139 |
-ifdef HAVE_FREEBL_LIBS |
| 140 |
-ifndef SKIP_CHK |
| 141 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) |
| 142 |
-endif |
| 143 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) |
| 144 |
-endif |
| 145 |
-ifdef HAVE_FREEBL_LIBS_32 |
| 146 |
-ifndef SKIP_CHK |
| 147 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) |
| 148 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) |
| 149 |
-endif |
| 150 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) |
| 151 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) |
| 152 |
-endif |
| 153 |
-ifdef HAVE_FREEBL_LIBS_32INT64 |
| 154 |
-ifndef SKIP_CHK |
| 155 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) |
| 156 |
-endif |
| 157 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) |
| 158 |
-endif |
| 159 |
-ifdef HAVE_FREEBL_LIBS_64 |
| 160 |
-ifndef SKIP_CHK |
| 161 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) |
| 162 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) |
| 163 |
-endif |
| 164 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) |
| 165 |
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) |
| 166 |
-endif |
| 167 |
endif |
| 168 |
$(MAKE) -C boot $@ |
| 169 |
$(MAKE) -C ssl $@ |
| 170 |
@@ -360,12 +261,6 @@ ifdef MOZ_XUL |
| 171 |
$(MAKE) -C pki $@ |
| 172 |
endif |
| 173 |
ifndef MOZ_NATIVE_NSS |
| 174 |
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean |
| 175 |
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean |
| 176 |
-ifndef SKIP_CHK |
| 177 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean |
| 178 |
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean |
| 179 |
-endif |
| 180 |
endif |
| 181 |
|
| 182 |
echo-requires-recursive:: |
