Use dynamic library & xpidl_module names from nmake build for win32 gmake builds for compatibility.
authorseawood%netscape.com
Wed, 16 Jan 2002 05:09:23 +0000
changeset 2557 81e48367bf7279779a2460321dc10dd79c6ed9ba
parent 2556 6f163850403975d1c1b04412b17f319f3160a5c2
child 2558 bef33904cfbd2dde5c56e44e56aef16db40934f3
child 2559 d7476ea3d42d982bf3017f706cb3b8df4a07eb56
child 2563 8b9b4d8005bbc4e3a4e6edc2e6bb81e5f344308f
push idunknown
push userunknown
push dateunknown
bugs58981
Use dynamic library & xpidl_module names from nmake build for win32 gmake builds for compatibility. bug #58981 sr=jag
dbm/src/Makefile.in
dbm/tests/Makefile.in
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -24,16 +24,20 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 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 \
 		h_func.c \
 		h_log2.c \
 		h_page.c \
 		hash.c \
 		hash_buf.c \
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -26,17 +26,21 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
 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)
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif