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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
ecfce48
..
acca53f
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# This file is part of the YAZ toolkit.
# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
+# Copyright (C) 1995-2009 Index Data
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-10,7
+10,7
@@
DEBUG=0 # 0 for release, 1 for debug
USE_MANIFEST = 0
# TCL
USE_MANIFEST = 0
# TCL
-TCL="C:\Tcl\bin\tclsh84.exe"
+TCL="C:\Tcl\bin\tclsh85.exe"
#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
HAVE_TCL=1
#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
HAVE_TCL=1
@@
-25,11
+25,11
@@
ICU_DIR = c:\icu
# libxslt
HAVE_LIBXSLT=1
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.19.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
# libxml2
HAVE_LIBXML2=1
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.28.win32
+LIBXML2_DIR=c:\libxml2-2.7.1.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
@@
-60,8
+60,6
@@
nsis:
nsishelp:
$(NSIS)
nsishelp:
$(NSIS)
-generate: generated_files
-
# Directories
# The current directory is supposed to be something like
# ..../yaz/win, everything is relative to that
# Directories
# The current directory is supposed to be something like
# ..../yaz/win, everything is relative to that
@@
-174,15
+172,15
@@
ICU_DEF= \
/I"$(ICU_DIR)\include"
ICU_LIB= \
$(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
/I"$(ICU_DIR)\include"
ICU_LIB= \
$(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
+icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
yazicu: dirs generate $(YAZ_ICU)
yazicu: dirs generate $(YAZ_ICU)
-$(BINDIR)\icudt38.dll:
- copy "$(ICU_DIR)\bin\icudt38.dll" $(BINDIR)
-$(BINDIR)\icuin38.dll:
- copy "$(ICU_DIR)\bin\icuin38.dll" $(BINDIR)
-$(BINDIR)\icuuc38.dll:
- copy "$(ICU_DIR)\bin\icuuc38.dll" $(BINDIR)
+$(BINDIR)\icudt40.dll:
+ copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
+$(BINDIR)\icuin40.dll:
+ copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
+$(BINDIR)\icuuc40.dll:
+ copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
@@
-283,7
+281,7
@@
MT=mt.exe /nologo
MT=echo
!endif
MT=echo
!endif
-LINK_LIBS= kernel32.lib wsock32.lib advapi32.lib \
+LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
@@
-330,6
+328,7
@@
YAZ_CLIENT_OBJS= \
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
ZTEST_OBJS= \
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
ZTEST_OBJS= \
+ $(OBJDIR)\dummy-opac.obj \
$(OBJDIR)\read-marc.obj \
$(OBJDIR)\read-grs.obj \
$(OBJDIR)\ztest.obj
$(OBJDIR)\read-marc.obj \
$(OBJDIR)\read-grs.obj \
$(OBJDIR)\ztest.obj
@@
-404,6
+403,7
@@
MISC_OBJS= \
$(OBJDIR)\ber_oid.obj \
$(OBJDIR)\ber_tag.obj \
$(OBJDIR)\dumpber.obj \
$(OBJDIR)\ber_oid.obj \
$(OBJDIR)\ber_tag.obj \
$(OBJDIR)\dumpber.obj \
+ $(OBJDIR)\errno.obj \
$(OBJDIR)\odr.obj \
$(OBJDIR)\odr_any.obj \
$(OBJDIR)\odr_bit.obj \
$(OBJDIR)\odr.obj \
$(OBJDIR)\odr_any.obj \
$(OBJDIR)\odr_bit.obj \
@@
-444,6
+444,7
@@
MISC_OBJS= \
$(OBJDIR)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
$(OBJDIR)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
+ $(OBJDIR)\iso5426.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
$(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
$(OBJDIR)\libxml2_error.obj \
@@
-479,6
+480,7
@@
MISC_OBJS= \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
+ $(OBJDIR)\rpn2cql.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
@@
-493,6
+495,9
@@
MISC_OBJS= \
$(OBJDIR)\iconv_encode_marc8.obj \
$(OBJDIR)\iconv_decode_marc8.obj \
$(OBJDIR)\iconv_encode_wchar.obj \
$(OBJDIR)\iconv_encode_marc8.obj \
$(OBJDIR)\iconv_decode_marc8.obj \
$(OBJDIR)\iconv_encode_wchar.obj \
+ $(OBJDIR)\iconv_decode_iso5426.obj \
+ $(OBJDIR)\iconv_decode_danmarc.obj \
+ $(OBJDIR)\mutex.obj \
$(OBJDIR)\sc.obj
Z3950_OBJS= \
$(OBJDIR)\sc.obj
Z3950_OBJS= \
@@
-653,12
+658,13
@@
GENERATED_H_FILES= \
$(ILL_CORE_H_FILES) \
$(ITEM_REQ_H_FILES)
$(ILL_CORE_H_FILES) \
$(ITEM_REQ_H_FILES)
-generated_files: \
+generate: \
$(GENERATED_H_FILES) \
$(GENERATED_C_FILES) \
$(SRCDIR)\diagsrw.c \
$(SRCDIR)\diagbib1.c \
$(GENERATED_H_FILES) \
$(GENERATED_C_FILES) \
$(SRCDIR)\diagsrw.c \
$(SRCDIR)\diagbib1.c \
- $(SRCDIR)\diagsru_update.c
+ $(SRCDIR)\diagsru_update.c \
+ $(INCLDIR)\yaz\yaz-version.h
# Compiling
# Compiling
@@
-752,7
+758,11
@@
$(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
@cd $(SRCDIR)
$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
@cd $(SRCDIR)
$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
-$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
+$(SRCDIR)\iso5426.c: $(SRCDIR)\codetables-iso5426.xml $(SRCDIR)\charconv.tcl
+ @cd $(SRCDIR)
+ $(TCL) charconv.tcl -r -p iso5426 codetables-iso5426.xml -o iso5426.c
+
+$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
@cd $(SRCDIR)
$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
@cd $(SRCDIR)
$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
@@
-768,6
+778,11
@@
$(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
@cd $(SRCDIR)
$(TCL) csvtosru_update.tcl $(SRCDIR)
@cd $(SRCDIR)
$(TCL) csvtosru_update.tcl $(SRCDIR)
+$(INCLDIR)\yaz\yaz-version.h:
+ @cd $(SRCDIR)
+ $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+
+
!endif
!if $(HAVE_BISON)
!endif
!if $(HAVE_BISON)