X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b2ea8df05b03885e93d543ef1e7cf33711e49e41;hb=5b72794c95eb694bd6717e5c11b0a4e45078a56b;hp=2d9eb4793900259d8191c0a49bb309c9ab982e17;hpb=852d5f1f9aa0a70f7e54a68143ee86752394a2f2;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 2d9eb47..b2ea8df 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.55 2006-08-22 13:39:28 adam Exp $
+# $Id: makefile,v 1.62 2006-12-15 21:11:37 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -39,18 +39,19 @@ all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
+
 YAZINCL=$(YAZDIR)\include
 YAZLIBS=$(YAZLIB)
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
-YAZLIB=$(YAZDIR)\lib\yazd.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yazd.dll
-YAZ_DLL_TARGET=$(BINDIR)\yazd.dll
+YAZLIB="$(YAZDIR)\lib\yazd.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yazd.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yazd.dll"
 !else
-YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
-YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
+YAZLIB="$(YAZDIR)\lib\yaz.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -129,12 +130,12 @@ dll: $(DLL)
 !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_SOURCE= $(EXPAT_DIR)\libs\libexpat.dll
+EXPAT_DLL_TARGET=$(BINDIR)\libexpat.dll
 expat: $(EXPAT_DLL_TARGET)
 
-$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
-	copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
+$(EXPAT_DLL_TARGET) : "$(EXPAT_DLL_SOURCE)"
+	copy "$(EXPAT_DLL_SOURCE)" "$(EXPAT_DLL_TARGET)"
 !else
 EXPAT_DEF= /D HAVE_EXPAT_H=0
 EXPAT_LIB=
@@ -158,7 +159,7 @@ iconv:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
@@ -305,10 +306,10 @@ LINK_PROGRAM= $(LINK) \
 # need to be specified, though
 
 ZSERVER_OBJS= \
-	$(OBJDIR)\zserver.obj 
+	$(OBJDIR)\zebrasrv.obj 
 
 ZEBRAIDX_OBJS= \
-	$(OBJDIR)\main.obj 
+	$(OBJDIR)\zebraidx.obj 
 TSTFLOCK_OBJS= \
 	$(OBJDIR)\tstflock.obj
 
@@ -320,6 +321,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
+	$(OBJDIR)\check_res.obj \
 	$(OBJDIR)\charmap.obj \
 	$(OBJDIR)\close.obj \
 	$(OBJDIR)\commit.obj \
@@ -352,6 +354,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\dopen.obj \
 	$(OBJDIR)\drdwr.obj \
+	$(OBJDIR)\exit.obj \
 	$(OBJDIR)\extract.obj \
 	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\imalloc.obj \
@@ -361,8 +364,10 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\isamb.obj \
 	$(OBJDIR)\isamc.obj \
 	$(OBJDIR)\isams.obj \
-	$(OBJDIR)\kcompare.obj \
+	$(OBJDIR)\isam_methods.obj \
+	$(OBJDIR)\it_key.obj \
 	$(OBJDIR)\kcontrol.obj \
+	$(OBJDIR)\key_block.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\limit.obj \
 	$(OBJDIR)\lookgrep.obj \
@@ -387,6 +392,8 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\regxread.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
+	$(OBJDIR)\rpnscan.obj \
+	$(OBJDIR)\rpnsearch.obj \
 	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
@@ -405,18 +412,20 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
 	$(OBJDIR)\stream.obj \
+	$(OBJDIR)\su_codec.obj \
 	$(OBJDIR)\symtab.obj \
 	$(OBJDIR)\trunc.obj \
+	$(OBJDIR)\untrans.obj \
 	$(OBJDIR)\update_path.obj \
 	$(OBJDIR)\update_file.obj \
 	$(OBJDIR)\xmlread.obj \
 	$(OBJDIR)\xpath.obj \
+	$(OBJDIR)\zaptterm.obj \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
 	$(OBJDIR)\zinfo.obj \
 	$(OBJDIR)\zint.obj \
-	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj
 
 # Compiling 
@@ -499,7 +508,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-#	copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
-	copy $(YAZBINDIR)\*.dll $(BINDIR)
+#	copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR)
+	copy "$(YAZBINDIR)\*.dll" $(BINDIR)