yazd.{dll,lib} instead of yazdebug.{dll,lib}.

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 33adabd..397c4bf 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,9 @@
 # Copyright (C) 1994-2004, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.82 2004-08-18 09:43:10 adam Exp $
+# $Id: makefile,v 1.85 2004-08-19 07:48:00 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
-#
 
 ###########################################################
 ############### Parameters 
@@ -41,13 +40,15 @@ all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
 
 NSIS="c:\program files\nsis\makensis.exe"
 
-nsis: 
+dist: 
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
-       nmake DEBUG=1 dll
        nmake DEBUG=0
        $(NSIS) yaz.nsi
 
+nsis:
+       $(NSIS) yaz.nsi
+
 nsishelp:
        $(NSIS)
 
@@ -86,8 +87,8 @@ TMP=$(TMPDIR)
 ###########################################################
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazdebug.dll
-IMPLIB=$(LIBDIR)\yazdebug.lib
+DLL=$(BINDIR)\yazd.dll
+IMPLIB=$(LIBDIR)\yazd.lib
 !else
 DLL=$(BINDIR)\yaz.dll
 IMPLIB=$(LIBDIR)\yaz.lib
@@ -111,9 +112,9 @@ CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
 # shortcut names defined here
-dll : $(DLL) 
-client: $(CLIENT)
-ztest: $(ZTEST)
+dll: dirs generate $(DLL) 
+client: dirs generate $(CLIENT)
+ztest: dirs generate $(ZTEST)
 
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)