Towards 1.3.1

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

diff --git a/win/makefile b/win/makefile
index 3a698f3..08bb5fe 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,15 +1,14 @@
-# Z'mbol/Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.12 2002-07-25 13:45:59 adam Exp $
+# Zebra makefile for MS NMAKE
+# $Id: makefile,v 1.15 2002-08-20 12:01:00 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
-ZMBOL=0
+DEBUG=0   # 0 for release, 1 for debug
 
 # iconv
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 default: all
@@ -21,7 +20,7 @@ all: dirs zebralib zserver zindex
 ###########################################################
 # The current directory is supposed to be something like
 # ..../Zebra/Win, everything is relative to that
-ROOTDIR=..   # The home of Z'mbol
+ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
 YAZDIR=$(ROOTDIR)\..\YAZ
@@ -71,13 +70,8 @@ TEMP=$(TMPDIR)
 ###########################################################
 
 ZEBRALIB=$(LIBDIR)\zebra.lib
-!if $(ZMBOL)
-ZSERVER=$(BINDIR)\zmbolsrv.exe
-ZINDEX=$(BINDIR)\zmbolidx.exe
-!else
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZINDEX=$(BINDIR)\zebraidx.exe
-!endif
 APITEST=$(BINDIR)\apitest.exe
 
 # shortcut names defined here
@@ -114,7 +108,6 @@ COMMON_C_OPTIONS=          \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
-  /D"ZMBOL=$(ZMBOL)"       \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \