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' into yaz4
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
2ff3d31
..
f6a124f
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.23+.win32
+LIBXSLT_DIR=c:\libxslt-1.1.26.win32
# libxml2
HAVE_LIBXML2=1
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.32+.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.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
@@
-48,20
+48,18
@@
all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
-dist:
+dist: yaz.nsi
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=0
$(NSIS) yaz.nsi
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=0
$(NSIS) yaz.nsi
-nsis:
+nsis: all yaz.nsi
$(NSIS) yaz.nsi
nsishelp:
$(NSIS)
$(NSIS) yaz.nsi
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)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
+icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
yazicu: dirs generate $(YAZ_ICU)
yazicu: dirs generate $(YAZ_ICU)
-$(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)
+$(BINDIR)\icudt42.dll:
+ copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR)
+$(BINDIR)\icuin42.dll:
+ copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR)
+$(BINDIR)\icuuc42.dll:
+ copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR)
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
@@
-405,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 \
@@
-445,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 \
@@
-484,6
+484,7
@@
MISC_OBJS= \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
+ $(OBJDIR)\uri.obj \
$(OBJDIR)\query-charset.obj \
$(OBJDIR)\tokenizer.obj \
$(OBJDIR)\copy_types.obj \
$(OBJDIR)\query-charset.obj \
$(OBJDIR)\tokenizer.obj \
$(OBJDIR)\copy_types.obj \
@@
-495,6
+496,8
@@
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
$(OBJDIR)\mutex.obj \
$(OBJDIR)\sc.obj
@@
-656,12
+659,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
@@
-755,7
+759,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
@@
-771,6
+779,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)