projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update doc/common
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
ac38182
..
8aeab91
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-7,8
+7,8
@@
DEBUG=0 # 0 for release, 1 for debug
USE_MANIFEST = 1
# TCL
USE_MANIFEST = 1
# TCL
-TCL="C:\Tcl\bin\tclsh85.exe"
-#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
HAVE_TCL=1
# iconv charcter conversion utility
HAVE_TCL=1
# iconv charcter conversion utility
@@
-457,6
+457,7
@@
MISC_OBJS= \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
+ $(OBJDIR)\wrbuf_sha1.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
@@
-497,6
+498,7
@@
MISC_OBJS= \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-event.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-event.obj \
+ $(OBJDIR)\zoom-memcached.obj \
$(OBJDIR)\zoom-record-cache.obj \
$(OBJDIR)\zoom-z3950.obj \
$(OBJDIR)\zoom-sru.obj \
$(OBJDIR)\zoom-record-cache.obj \
$(OBJDIR)\zoom-z3950.obj \
$(OBJDIR)\zoom-sru.obj \
@@
-507,6
+509,7
@@
MISC_OBJS= \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
$(OBJDIR)\init_diag.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
$(OBJDIR)\init_diag.obj \
+ $(OBJDIR)\init_globals.obj \
$(OBJDIR)\xmlquery.obj \
$(OBJDIR)\xmlerror.obj \
$(OBJDIR)\mime.obj \
$(OBJDIR)\xmlquery.obj \
$(OBJDIR)\xmlerror.obj \
$(OBJDIR)\mime.obj \
@@
-876,7
+879,7
@@
$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
!if $(HAVE_BISON)
$(SRCDIR)\cql.c: $(SRCDIR)\cql.y
@cd $(SRCDIR)
!if $(HAVE_BISON)
$(SRCDIR)\cql.c: $(SRCDIR)\cql.y
@cd $(SRCDIR)
- $(BISON) -y -o cql.c cql.y
+ $(BISON) -y -p cql_ -o cql.c cql.y
!endif
!endif