From e9a53718f1380c386eb8c3103720f522b47a0bba Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Mon, 25 Feb 2008 18:55:40 +0000 Subject: [PATCH] Bug 419242: moved a makefile rule from config.mk to Makefile so that 'all' is the default (first) makefile target. r=christophe.ravel --- security/nss/lib/softoken/Makefile | 3 +++ security/nss/lib/softoken/config.mk | 3 --- security/nss/lib/softoken/legacydb/Makefile | 2 ++ security/nss/lib/softoken/legacydb/config.mk | 3 --- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/security/nss/lib/softoken/Makefile b/security/nss/lib/softoken/Makefile index c1335505240..d70b909a888 100644 --- a/security/nss/lib/softoken/Makefile +++ b/security/nss/lib/softoken/Makefile @@ -78,6 +78,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk export:: private_export +# indicates dependency on freebl static lib +$(SHARED_LIBRARY): $(CRYPTOLIB) + # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile # pkcs11c.c in 64-bit mode for unknown reasons. A workaround is # to compile it with optimizations turned on. (Bugzilla bug #63815) diff --git a/security/nss/lib/softoken/config.mk b/security/nss/lib/softoken/config.mk index 13455f3001f..c22c2008b06 100644 --- a/security/nss/lib/softoken/config.mk +++ b/security/nss/lib/softoken/config.mk @@ -108,6 +108,3 @@ endif ifeq ($(OS_TARGET),WINCE) DEFINES += -DDBM_USING_NSPR endif - -# indicates dependency on freebl static lib -$(SHARED_LIBRARY): $(CRYPTOLIB) diff --git a/security/nss/lib/softoken/legacydb/Makefile b/security/nss/lib/softoken/legacydb/Makefile index a41aa72c696..78a7c78c7e1 100644 --- a/security/nss/lib/softoken/legacydb/Makefile +++ b/security/nss/lib/softoken/legacydb/Makefile @@ -78,3 +78,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk export:: private_export +# indicates dependency on freebl static lib +$(SHARED_LIBRARY): $(CRYPTOLIB) diff --git a/security/nss/lib/softoken/legacydb/config.mk b/security/nss/lib/softoken/legacydb/config.mk index 60a26b1a635..4f183942645 100644 --- a/security/nss/lib/softoken/legacydb/config.mk +++ b/security/nss/lib/softoken/legacydb/config.mk @@ -101,6 +101,3 @@ endif ifeq ($(OS_TARGET),WINCE) DEFINES += -DDBM_USING_NSPR endif - -# indicates dependency on freebl static lib -$(SHARED_LIBRARY): $(CRYPTOLIB)