diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-01-30 19:43:26 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-01-30 19:43:26 +0000 |
| commit | 3015415dded9e2081cf22e260f8b2e2f7467fdf7 (patch) | |
| tree | 3759337cfab7e78f11efaaf6cc51659f50b28e89 /security | |
| parent | c3a1ea79e8649cbf7ed64fac061373b34dee2dc9 (diff) | |
| download | nss-hg-3015415dded9e2081cf22e260f8b2e2f7467fdf7.tar.gz | |
Bugzilla bug #66889: do not export the Windows import libraries for the
loadable PKCS#11 modules fort32.dll, swft32.dll, and nssckbi.dll.
Reviewed by Bob Relyea.
Modified files:
nss/lib/ckfw/builtins/Makefile nss/lib/ckfw/builtins/config.mk
nss/lib/fortcrypt/config.mk
nss/lib/fortcrypt/swfort/pkcs11/config.mk
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/ckfw/builtins/Makefile | 5 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/config.mk | 14 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/config.mk | 13 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/pkcs11/config.mk | 13 |
4 files changed, 18 insertions, 27 deletions
diff --git a/security/nss/lib/ckfw/builtins/Makefile b/security/nss/lib/ckfw/builtins/Makefile index 54e92cc82..3ab0e9dcf 100644 --- a/security/nss/lib/ckfw/builtins/Makefile +++ b/security/nss/lib/ckfw/builtins/Makefile @@ -67,11 +67,6 @@ EXTRA_LIBS += \ endif -ifeq ($(OS_ARCH), WINNT) - SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll - IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib -endif - include $(CORE_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk index 80b3135f4..9ee0fb0b2 100644 --- a/security/nss/lib/ckfw/builtins/config.mk +++ b/security/nss/lib/ckfw/builtins/config.mk @@ -32,6 +32,20 @@ # CONFIG_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" +# +# Override TARGETS variable so that only shared libraries +# are specifed as dependencies within rules.mk. +# + +TARGETS = $(SHARED_LIBRARY) +LIBRARY = +IMPORT_LIBRARY = +PROGRAM = + +ifeq ($(OS_ARCH), WINNT) + SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll +endif + ifdef BUILD_IDG DEFINES += -DNSSDEBUG endif diff --git a/security/nss/lib/fortcrypt/config.mk b/security/nss/lib/fortcrypt/config.mk index 1e8237ff2..d54a9dfc0 100644 --- a/security/nss/lib/fortcrypt/config.mk +++ b/security/nss/lib/fortcrypt/config.mk @@ -32,21 +32,12 @@ # # -# Override TARGETS variable so that only static libraries +# Override TARGETS variable so that only shared libraries # are specifed as dependencies within rules.mk. # -ifeq ($(OS_TARGET), WIN16) -TARGETS = all -else TARGETS = $(SHARED_LIBRARY) -endif LIBRARY = -PURE_LIBRARY = +IMPORT_LIBRARY = PROGRAM = - -ifeq ($(OS_TARGET), WIN16) -dummy: - @echo $(TARGETS) -endif diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/config.mk b/security/nss/lib/fortcrypt/swfort/pkcs11/config.mk index 9b1a488d2..960774691 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/config.mk +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/config.mk @@ -32,21 +32,12 @@ # # -# Override TARGETS variable so that only static libraries +# Override TARGETS variable so that only shared libraries # are specifed as dependencies within rules.mk. # -ifeq ($(OS_TARGET), WIN16) -TARGETS = all -else TARGETS = $(SHARED_LIBRARY) $(SHARED_SW_LIBRARY) $(LIBCI_JAR) $(LIBCI_SW_JAR) -endif LIBRARY = -PURE_LIBRARY = +IMPORT_LIBRARY = PROGRAM = - -ifeq ($(OS_TARGET), WIN16) -dummy: - @echo $(TARGETS) -endif |