From f44486fcc8e2f22aa1a6d1d8dcd7712b6c7693fe Mon Sep 17 00:00:00 2001 From: "emaldona%redhat.com" Date: Tue, 17 Aug 2010 22:27:12 +0000 Subject: [PATCH] Bug 588052 - FREEBL_NO_DEPEND should not depend on FREEBL_CHILD_BUILD=1, r=wtc,emaldona git-svn-id: svn://10.0.0.236/trunk@261056 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/freebl/Makefile | 5 +++++ mozilla/security/nss/lib/freebl/config.mk | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile index 86b27602005..da21920d446 100644 --- a/mozilla/security/nss/lib/freebl/Makefile +++ b/mozilla/security/nss/lib/freebl/Makefile @@ -76,6 +76,11 @@ endif ifeq ($(FREEBL_NO_DEPEND),1) DEFINES += -DFREEBL_NO_DEPEND + LOWHASH_SRCS = stubs.c nsslowhash.c + LOWHASH_EXPORTS = nsslowhash.h + MAPFILE_SOURCE = freebl_hash.def +else + MAPFILE_SOURCE = freebl.def endif # FREEBL_USE_PRELINK diff --git a/mozilla/security/nss/lib/freebl/config.mk b/mozilla/security/nss/lib/freebl/config.mk index d872b32c786..921d39887f5 100644 --- a/mozilla/security/nss/lib/freebl/config.mk +++ b/mozilla/security/nss/lib/freebl/config.mk @@ -66,14 +66,6 @@ ALL_TRASH := $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \ else -ifeq ($(FREEBL_NO_DEPEND),1) -LOWHASH_SRCS = stubs.c nsslowhash.c -LOWHASH_EXPORTS = nsslowhash.h -MAPFILE_SOURCE = freebl_hash.def -else -MAPFILE_SOURCE = freebl.def -endif - # This is a recursive child make. We build the shared lib. TARGETS = $(SHARED_LIBRARY)