# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
-#
-# Programmed by
-# Heikki Levanto & Adam Dickmeiss
+# Copyright (C) 1995-2010 Index Data
# Parameters
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 0
+USE_MANIFEST = 1
# TCL
-TCL="C:\Tcl\bin\tclsh84.exe"
+TCL="C:\Tcl\bin\tclsh85.exe"
#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
HAVE_TCL=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_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
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
-nsis:
+nsis: all yaz.nsi
$(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
# Targets - what to make
!if $(DEBUG)
-YAZ_DLL=$(BINDIR)\yaz3d.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3d.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3d.lib
+YAZ_DLL=$(BINDIR)\yaz4d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
!else
-YAZ_DLL=$(BINDIR)\yaz3.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3.lib
+YAZ_DLL=$(BINDIR)\yaz4.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
/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)
-$(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
$(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)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
+ $(OBJDIR)\iso5426.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
- $(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\diagsru_update.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)\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)\json.obj \
+ $(OBJDIR)\sc.obj \
+ $(OBJDIR)\xml_include.obj \
+ $(OBJDIR)\file_glob.obj \
+ $(OBJDIR)\dirent.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
$(ILL_OBJS) \
ICU_DLL_OBJS =\
- $(OBJDIR)\icu_I18N.obj
+ $(OBJDIR)\icu_chain.obj \
+ $(OBJDIR)\icu_utf16.obj \
+ $(OBJDIR)\icu_utf8.obj \
+ $(OBJDIR)\icu_transform.obj \
+ $(OBJDIR)\icu_casemap.obj \
+ $(OBJDIR)\icu_tokenizer.obj \
+ $(OBJDIR)\icu_sortkey.obj
# Generated C and 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 \
- $(SRCDIR)\diagsru_update.c
+ $(SRCDIR)\diagsru_update.c \
+ $(INCLDIR)\yaz\yaz-version.h
# Compiling
@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) csvtosru_update.tcl $(SRCDIR)
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/configure.ac
+ @cd $(SRCDIR)
+ $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+
+
!endif
!if $(HAVE_BISON)