X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=815074370353c1f5b4367d7096e988cb833635a7;hb=ad082113401287efdd32da0b2c2a3b169a169ea9;hp=3a698f3efa223afe950c042cbf6a70c904989562;hpb=7bb77f81cdde5a5851129ce1598fcace767c932a;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 3a698f3..8150743 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,15 +1,18 @@
-# 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.17 2002-09-03 12:22:21 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
+# EXPAT is optional. It's required for grs.xml-filters.
+HAVE_EXPAT=1
+EXPAT_DIR= c:\Expat-1.95.4
+
+# iconv is optional
+HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 default: all
@@ -21,7 +24,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
@@ -29,7 +32,8 @@ YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
 YAZBINDIR=$(YAZDIR)\bin
-YAZDLL=$(YAZBINDIR)\yaz.dll
+YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
+YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
 # (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
@@ -71,13 +75,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
@@ -90,15 +89,25 @@ apitest: $(APITEST)
 ############### Compiler and linker options 
 ###########################################################
 
+!if $(HAVE_EXPAT)
+EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
+EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
+EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
+EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
+	copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
+!else
+EXPAT_DEF= /D HAVE_EXPAT_H=0
+EXPAT_LIB=
+EXPAT_DLL_SOURCE=
+EXPAT_DLL_TARGET=
+!endif
+
 !if $(HAVE_ICONV)
-ICONV_DEF= \
-  /D HAVE_ICONV_H=1 \
-  /I"$(ICONV_DIR)\include"
-ICONV_LIB= \
-  $(ICONV_DIR)\lib\iconv.lib
+ICONV_DEF= /D HAVE_ICONV_H=1 /I"$(ICONV_DIR)\include"
+ICONV_LIB= $(ICONV_DIR)\lib\iconv.lib
 !else
-ICONV_DEF= \
-  /D HAVE_ICONV_H=0
+ICONV_DEF= /D HAVE_ICONV_H=0
 ICONV_LIB=
 !endif
 
@@ -111,10 +120,10 @@ COMMON_C_OPTIONS=          \
   /D "WIN32"               \
   /D"_CONSOLE" /D"_MBCS"   \
   $(ICONV_DEF)             \
+  $(EXPAT_DEF)             \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
-  /D"ZMBOL=$(ZMBOL)"       \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -152,7 +161,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib $(ICONV_LIB)
+           wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /machine:i386 \
@@ -246,6 +255,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\recstat.obj \
 	$(OBJDIR)\rectext.obj \
 	$(OBJDIR)\regxread.obj \
+	$(OBJDIR)\xmlread.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
 	$(OBJDIR)\rsbool.obj \
@@ -394,15 +404,20 @@ clean:
 	-del $(OBJDIR)\*.obj
 	-del $(OBJDIR)\*.sbr
 	-del $(BINDIR)\*.exe
+	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
 	-del $(LIBDIR)\*.lib
 
 ########### check directories and create if needed
-dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
+dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) \
+	$(EXPAT_DLL_TARGET) $(YAZ_DLL_TARGET)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
  	if not exist "$@/$(NUL)" mkdir "$@"
 
+$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
+	copy $(YAZ_DLL_SOURCE) $(YAZ_DLL_TARGET)
+
 ###########################################################
 ############### Explicit dependencies
 ###########################################################