Work on bug #550: Avoid exit. In particular the mfile/cfile/bfile has

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

diff --git a/win/makefile b/win/makefile
index a92d421..7f98134 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.54 2006-08-14 18:12:35 adam Exp $
+# $Id: makefile,v 1.59 2006-11-14 08:12:11 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=
@@ -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
 
@@ -352,7 +353,9 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\dirs.obj \
        $(OBJDIR)\dopen.obj \
        $(OBJDIR)\drdwr.obj \
+       $(OBJDIR)\exit.obj \
        $(OBJDIR)\extract.obj \
+       $(OBJDIR)\flock.obj \
        $(OBJDIR)\imalloc.obj \
        $(OBJDIR)\inline.obj \
        $(OBJDIR)\insert.obj \
@@ -364,7 +367,6 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\kcontrol.obj \
        $(OBJDIR)\kinput.obj \
        $(OBJDIR)\limit.obj \
-       $(OBJDIR)\flock.obj \
        $(OBJDIR)\lookgrep.obj \
        $(OBJDIR)\lookup.obj \
        $(OBJDIR)\lookupec.obj \
@@ -387,6 +389,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 \
@@ -404,18 +408,20 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\snippet.obj \
        $(OBJDIR)\sortidx.obj \
        $(OBJDIR)\states.obj \
+       $(OBJDIR)\stream.obj \
        $(OBJDIR)\symtab.obj \
+       $(OBJDIR)\trunc.obj \
+       $(OBJDIR)\untrans.obj \
        $(OBJDIR)\update_path.obj \
        $(OBJDIR)\update_file.obj \
-       $(OBJDIR)\trunc.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 
@@ -498,7 +504,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)