summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseawood%netscape.com <devnull@localhost>2002-01-16 05:09:23 +0000
committerseawood%netscape.com <devnull@localhost>2002-01-16 05:09:23 +0000
commit7f18e2604d4cd7e0b312649752882b553d6f223b (patch)
tree63b36c872f9d6b2feca495a8d2304b1951154e09
parent3501ab682d11402caf14c9c07a0424d9a50f1f05 (diff)
downloadnss-hg-7f18e2604d4cd7e0b312649752882b553d6f223b.tar.gz
Use dynamic library & xpidl_module names from nmake build for win32 gmake builds for compatibility.
bug #58981 sr=jag
-rw-r--r--dbm/src/Makefile.in4
-rw-r--r--dbm/tests/Makefile.in4
2 files changed, 8 insertions, 0 deletions
diff --git a/dbm/src/Makefile.in b/dbm/src/Makefile.in
index a83a586d8..d65e0f8e7 100644
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -29,6 +29,10 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mozdbm_s
LIB_IS_C_ONLY = 1
+ifeq ($(OS_ARCH),WINNT)
+LIBRARY_NAME = dbm$(MOZ_BITS)
+endif
+
CSRCS = \
db.c \
h_bigkey.c \
diff --git a/dbm/tests/Makefile.in b/dbm/tests/Makefile.in
index 7ec5caabf..96cbdf8b5 100644
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -31,7 +31,11 @@ PROGRAM = lots$(BIN_SUFFIX)
CSRCS = lots.c
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
+else
EXTRA_DSO_LIBS = mozdbm_s
+endif
LIBS = $(EXTRA_DSO_LIBS)