projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed documentation of non-working 'insert', 'update' 'delete' functionality in...
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
9494c77
..
b2ea8df
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.53 2006-07-05 13:19:15 adam Exp $
+# $Id: makefile,v 1.62 2006-12-15 21:11:37 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-13,15
+13,15
@@
EXPAT_DIR=c:\Expat-1.95.8
# iconv is optional
HAVE_ICONV=1
# iconv is optional
HAVE_ICONV=1
-ICONV_DIR=c:\iconv-1.9.1.win32
+ICONV_DIR=c:\iconv-1.9.2.win32
# libxslt. For alvis
HAVE_LIBXSLT=1
# libxslt. For alvis
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.17.win32
# libxml2. Used by libxslt
HAVE_LIBXML2=1
# libxml2. Used by libxslt
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=c:\libxml2-2.6.26.win32
# zlib compression. Used by libxml2
ZLIB_DIR = c:\zlib-1.2.3.win32
# zlib compression. Used by libxml2
ZLIB_DIR = c:\zlib-1.2.3.win32
@@
-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.
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)
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
!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.
!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"
!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: $(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=
!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"
!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:
libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
@@
-305,10
+306,10
@@
LINK_PROGRAM= $(LINK) \
# need to be specified, though
ZSERVER_OBJS= \
# need to be specified, though
ZSERVER_OBJS= \
- $(OBJDIR)\zserver.obj
+ $(OBJDIR)\zebrasrv.obj
ZEBRAIDX_OBJS= \
ZEBRAIDX_OBJS= \
- $(OBJDIR)\main.obj
+ $(OBJDIR)\zebraidx.obj
TSTFLOCK_OBJS= \
$(OBJDIR)\tstflock.obj
TSTFLOCK_OBJS= \
$(OBJDIR)\tstflock.obj
@@
-320,6
+321,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\bfile.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
$(OBJDIR)\bfile.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
+ $(OBJDIR)\check_res.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
@@
-340,6
+342,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\d1_sumout.obj \
$(OBJDIR)\d1_sutrs.obj \
$(OBJDIR)\d1_tagset.obj \
$(OBJDIR)\d1_sumout.obj \
$(OBJDIR)\d1_sutrs.obj \
$(OBJDIR)\d1_tagset.obj \
+ $(OBJDIR)\d1_utils.obj \
$(OBJDIR)\d1_varset.obj \
$(OBJDIR)\d1_write.obj \
$(OBJDIR)\dclose.obj \
$(OBJDIR)\d1_varset.obj \
$(OBJDIR)\d1_write.obj \
$(OBJDIR)\dclose.obj \
@@
-351,7
+354,9
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\dirs.obj \
$(OBJDIR)\dopen.obj \
$(OBJDIR)\drdwr.obj \
$(OBJDIR)\dirs.obj \
$(OBJDIR)\dopen.obj \
$(OBJDIR)\drdwr.obj \
+ $(OBJDIR)\exit.obj \
$(OBJDIR)\extract.obj \
$(OBJDIR)\extract.obj \
+ $(OBJDIR)\flock.obj \
$(OBJDIR)\imalloc.obj \
$(OBJDIR)\inline.obj \
$(OBJDIR)\insert.obj \
$(OBJDIR)\imalloc.obj \
$(OBJDIR)\inline.obj \
$(OBJDIR)\insert.obj \
@@
-359,11
+364,12
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\isamb.obj \
$(OBJDIR)\isamc.obj \
$(OBJDIR)\isams.obj \
$(OBJDIR)\isamb.obj \
$(OBJDIR)\isamc.obj \
$(OBJDIR)\isams.obj \
- $(OBJDIR)\kcompare.obj \
+ $(OBJDIR)\isam_methods.obj \
+ $(OBJDIR)\it_key.obj \
$(OBJDIR)\kcontrol.obj \
$(OBJDIR)\kcontrol.obj \
+ $(OBJDIR)\key_block.obj \
$(OBJDIR)\kinput.obj \
$(OBJDIR)\limit.obj \
$(OBJDIR)\kinput.obj \
$(OBJDIR)\limit.obj \
- $(OBJDIR)\flock.obj \
$(OBJDIR)\lookgrep.obj \
$(OBJDIR)\lookup.obj \
$(OBJDIR)\lookupec.obj \
$(OBJDIR)\lookgrep.obj \
$(OBJDIR)\lookup.obj \
$(OBJDIR)\lookupec.obj \
@@
-386,6
+392,8
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\regxread.obj \
$(OBJDIR)\res.obj \
$(OBJDIR)\retrieve.obj \
$(OBJDIR)\regxread.obj \
$(OBJDIR)\res.obj \
$(OBJDIR)\retrieve.obj \
+ $(OBJDIR)\rpnscan.obj \
+ $(OBJDIR)\rpnsearch.obj \
$(OBJDIR)\rsbetween.obj \
$(OBJDIR)\rsbool.obj \
$(OBJDIR)\rset.obj \
$(OBJDIR)\rsbetween.obj \
$(OBJDIR)\rsbool.obj \
$(OBJDIR)\rset.obj \
@@
-403,18
+411,21
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\snippet.obj \
$(OBJDIR)\sortidx.obj \
$(OBJDIR)\states.obj \
$(OBJDIR)\snippet.obj \
$(OBJDIR)\sortidx.obj \
$(OBJDIR)\states.obj \
+ $(OBJDIR)\stream.obj \
+ $(OBJDIR)\su_codec.obj \
$(OBJDIR)\symtab.obj \
$(OBJDIR)\symtab.obj \
+ $(OBJDIR)\trunc.obj \
+ $(OBJDIR)\untrans.obj \
$(OBJDIR)\update_path.obj \
$(OBJDIR)\update_file.obj \
$(OBJDIR)\update_path.obj \
$(OBJDIR)\update_file.obj \
- $(OBJDIR)\trunc.obj \
$(OBJDIR)\xmlread.obj \
$(OBJDIR)\xpath.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)\zebra-lock.obj \
$(OBJDIR)\zebraapi.obj \
$(OBJDIR)\zebramap.obj \
$(OBJDIR)\zinfo.obj \
$(OBJDIR)\zint.obj \
- $(OBJDIR)\zrpn.obj \
$(OBJDIR)\zsets.obj
# Compiling
$(OBJDIR)\zsets.obj
# Compiling
@@
-497,7
+508,7
@@
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
yaz: $(YAZ_DLL_TARGET)
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
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)