From 028dac803623af6053410fabecb58108d47a1564 Mon Sep 17 00:00:00 2001 From: "ddrinan%netscape.com" Date: Sat, 13 May 2000 03:27:53 +0000 Subject: [PATCH] Put nls layer into a separate static library --- security/psm/Makefile | 2 +- security/psm/server/Makefile | 4 +++- security/psm/server/manifest.mn | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/security/psm/Makefile b/security/psm/Makefile index 243827bbfa7..18ad4d3f797 100755 --- a/security/psm/Makefile +++ b/security/psm/Makefile @@ -79,6 +79,6 @@ ifeq ($(OS_RELEASE), 5.5.1) endif endif cd ../nss; gmake nss_RelEng_bld - gmake import IMPORTS=i18n/m14 RELEASE_TREE=/h/tortoise/export/share/builds/components + gmake import IMPORTS=nlslayer/m14 RELEASE_TREE=/h/tortoise/export/share/builds/components gmake diff --git a/security/psm/server/Makefile b/security/psm/server/Makefile index 1cd553be473..a02e55e1e44 100644 --- a/security/psm/server/Makefile +++ b/security/psm/server/Makefile @@ -78,7 +78,7 @@ CPLUSPLUSRUNTIME = -lC -lm endif endif -INCLUDES += -I$(LDAPSDKDIST)/include -I$(CORE_DEPTH)/../dist/public/i18n +INCLUDES += -I$(LDAPSDKDIST)/include -I$(CORE_DEPTH)/../dist/public/nlslayer ifeq ($(OS_ARCH), SunOS) ifeq ($(OS_RELEASE), 5.5.1) @@ -177,6 +177,7 @@ EXTRA_LIBS = \ $(DIST)/lib/freebl.lib \ $(DIST)/lib/dbm.lib \ $(DIST)/lib/protocol.lib \ + $(DIST)/lib/nlslayer.lib \ $(DIST)/lib/xpcom.lib \ $(NSPR_STUB_LIBS) \ $(LDAPSDKDIST)/lib/nsldaps32v30.lib \ @@ -248,6 +249,7 @@ EXTRA_LIBS += \ $(DIST)/lib/libcrypto.a \ $(DIST)/lib/libdbm.a \ $(DIST)/lib/libprotocol.a \ + $(DIST)/lib/libnlslayer.a \ $(NSPR_LINK_LIBS) \ $(XPCOM_LINK_LIBS) \ $(CPLUSPLUSRUNTIME) \ diff --git a/security/psm/server/manifest.mn b/security/psm/server/manifest.mn index 45008e681ee..a2fd2dd96fc 100644 --- a/security/psm/server/manifest.mn +++ b/security/psm/server/manifest.mn @@ -59,10 +59,6 @@ CSRCS = \ msgthread.c \ $(NULL) -CPPSRCS = \ - nlslayer.cpp \ - $(NULL) - RESNAME = psm.rc RES = $(PLATFORM)/psm.res