# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2010 Index Data
+# Copyright (C) Index Data
-# Parameters
+# Parameters
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 1
+BARCH = 32 # 32=win32/x86 or 64=x64
# 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_ICONV=1
-ICONV_DIR = c:\iconv-1.9.2.win32
+HAVE_ICONV=0
+ICONV_DIR = c:\iconv-1.9.2.win$(BARCH)
# icu charcter conversion utility
# get icu libraries from http://www.icu-project.org
HAVE_ICU=1
-ICU_DIR = c:\icu
+ICU_VER=56
+ICU_BASE = c:\icu-56.1-vs2015
+!if $(BARCH) == 32
+ICU_LIB = $(ICU_BASE)\lib
+ICU_BIN = $(ICU_BASE)\bin
+!elseif $(BARCH) == 64
+ICU_LIB = $(ICU_BASE)\lib64
+ICU_BIN = $(ICU_BASE)\bin64
+!else
+!error BARCH must be 32 or 64
+!endif
+ICU_INCLUDE = $(ICU_BASE)\include
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.26.win32
+LIBXSLT_DIR=c:\libxslt-1.1.28.win$(BARCH)
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.6.win32
-
-# zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.3.win32
+LIBXML2_DIR=c:\libxml2-2.9.2.win$(BARCH)
# get WIN32 binaries libxml2 & iconv & zlib from here:
# http://www.zlatkovic.com/libxml.en.html
default: all
-all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
+all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
+ testprog iconv icu libxml2 libxslt yaz_url
+
+NSIS="c:\program files (x86)\nsis\makensis.exe"
+HHC="c:\program files (x86)\html help workshop\hhc.exe"
+
+YAZ4J_DIR="..\..\yaz4j"
+
+YAZPATH="$(MAKEDIR)\.."
+
-NSIS="c:\program files\nsis\makensis.exe"
-HHC="c:\program files\html help workshop\hhc.exe"
+dist: yaz.nsi version.nsi distclean
+ nmake DEBUG=0 all yaz4j
+ nmake nsis
-dist: yaz.nsi
+dist64: yaz.nsi version.nsi distclean
+ nmake make64 yaz4j
+ nmake nsis64
+
+make64:
+ nmake DEBUG=0 BARCH=64 all
+
+distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=0
- $(NSIS) yaz.nsi
-nsis: all yaz.nsi
- $(NSIS) yaz.nsi
+nsis: version.nsi
+ $(NSIS) /DVSARCH=x86 /DVSVER=14 yaz.nsi
+
+nsis64: version.nsi
+ $(NSIS) /DVSARCH=x64 /DVSVER=14 yaz.nsi
nsishelp:
$(NSIS)
WINDIR=$(ROOTDIR)\win # all these Win make things
SRCDIR=$(ROOTDIR)\src # for the case we move them under src
DOCDIR=$(ROOTDIR)\doc # where the doc is
+JAVADIR=$(ROOTDIR)\java
# where we store intermediate files
!if $(DEBUG)
UTILDIR=$(ROOTDIR)\UTIL
TESTDIR=$(ROOTDIR)\TEST
-TMPDIR=$(ROOTDIR)\win\tmp
-TMP=$(TMPDIR)
+# TMPDIR=$(ROOTDIR)\win\tmp
+# TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
-YAZ_DLL=$(BINDIR)\yaz4d.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
-YAZ_COND_DLL=$(BINDIR)\yaz_cond4d.dll
-YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4d.lib
+YAZ_DLL=$(BINDIR)\yaz5d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz5d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu5d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5d.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond5d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5d.lib
!else
-YAZ_DLL=$(BINDIR)\yaz4.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
-YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
-YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
+YAZ_DLL=$(BINDIR)\yaz5.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz5.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu5.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond5.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
YAZ_ICU=$(BINDIR)\yaz-icu.exe
+YAZ_URL=$(BINDIR)\yaz-url.exe
ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
SC_TEST=$(BINDIR)\sc_test.exe
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
$(ZOOMTST10)
-utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
+yaz_url: $(YAZ_URL)
+
+utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
htmlhelp: $(DOCDIR)\htmlhelp.chm
!endif
-###TRYING ICU FLAGS HERE WORKS ####
-## ADAM ARE THESE FLAGS OK and the DLL sufficient ##
-##IT COMPILES AND SEEMS TO WORK
-
!if $(HAVE_ICU)
ICU_DEF= \
- /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 \
- /I"$(ICU_DIR)\include"
-ICU_LIB= \
- $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
-yazicu: dirs generate $(YAZ_ICU)
-
-$(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)
+ /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= \
+ $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
+icu: $(BINDIR)\icudt$(ICU_VER).dll \
+ $(BINDIR)\icuin$(ICU_VER).dll \
+ $(BINDIR)\icuuc$(ICU_VER).dll
+yazicu: dirs generate $(YAZ_ICU)
+
+$(BINDIR)\icudt$(ICU_VER).dll:
+ copy "$(ICU_BIN)\icudt$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuin$(ICU_VER).dll:
+ copy "$(ICU_BIN)\icuin$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuuc$(ICU_VER).dll:
+ copy "$(ICU_BIN)\icuuc$(ICU_VER).dll" $(BINDIR)
!else
-ICU_DEF= \
- /D YAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_DEF= /D YAZ_HAVE_ICU=0
+ICU_LIBS=
icu:
yazicu:
!endif
-###
+###
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
+LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include\libxml2"
+libxml2: $(BINDIR)\libxml2.dll
$(BINDIR)\libxml2.dll:
copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
- copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
!else
LIBXML2_LIB=
LIBXML2_DEF=/D YAZ_HAVE_XML2=0
-libxml2:
+libxml2:
!endif
libxslt: $(BINDIR)\libxslt.dll
$(BINDIR)\libxslt.dll:
- copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+ copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
!else
LIBXSLT_LIB=
LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
-libxslt:
+libxslt:
!endif
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
- /Fd"$(OBJDIR)\\"
+ /Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
- /I"$(ROOTDIR)\include"
+ /I"$(ROOTDIR)\include" \
+ /I"$(ROOTDIR)\libstemmer_c\include"
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
/D "NDEBUG" \
/MD /O2
-# /W3 = warning level
-# /GX = Enable exception handling
-# /FD = Generate file dependencies (what ever they are)
-# /c = compile without linking
-# /FR = Generate browse info (.sbr file that gets combined into .bsc)
-# /Fo = object file name (or at least path)
-# /Fd = debug database name (or path)
-# /MD = Runtime library: Multithread DLL
-# /MDd = Runtime library: Multithread DLL (debug)
-# /Od = Disable optimising (debug)
-# /O2 = Optimize for speed
-# /Gm = Minimal rebuild (some cpp class stuff)
-# /Zi = Program database for debuggers
-# /ZI = Pgm database with special "edit&continue" stuff - not available in C5
-
+MVN_ARGS=-Dyaz.path=$(YAZPATH)
+# without >log below, mvn install does NOT work
+yaz4j: $(JAVADIR)
+ cd $(YAZ4J_DIR)
+ mvn clean
+ mvn $(MVN_ARGS) -DskipTests install >log
+ copy /Y win32\target\yaz4j.dll "$(MAKEDIR)\..\bin"
+ copy /Y any\target\yaz4j.jar "$(MAKEDIR)\..\java"
### Linker options
LINK=link.exe
-!if $(USE_MANIFEST)
-MT=mt.exe /nologo
-!else
-MT=echo
-!endif
-
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
-DEBUG_LNK_OPTIONS= /debug
+DEBUG_LNK_OPTIONS= /debug
RELEASE_LNK_OPTIONS=
-DLL_LINK_OPTIONS= /dll
-CLIENT_LINK_OPTIONS = /subsystem:console
+DLL_LINK_OPTIONS= /dll
+CLIENT_LINK_OPTIONS = /subsystem:console
COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
TCLOPT= $(COMMON_TCL_OPTIONS)
!else
-COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES)
+COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES)
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
TCLOPT= $(COMMON_TCL_OPTIONS)
!endif
# Source and object modules
-# Note: Ordinary source files are not specified here at
+# Note: Ordinary source files are not specified here at
# all, make finds them in suitable dirs. The object modules
# need to be specified, though
$(OBJDIR)\admin.obj \
$(OBJDIR)\fhistory.obj
-YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
+YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
+YAZ_URL_OBJS= $(OBJDIR)\yaz-url.obj
COND_DLL_OBJS= $(OBJDIR)\condvar.obj
ZTEST_OBJS= \
$(OBJDIR)\dummy-opac.obj \
$(OBJDIR)\read-marc.obj \
$(OBJDIR)\read-grs.obj \
- $(OBJDIR)\ztest.obj
+ $(OBJDIR)\ztest.obj
SC_TEST_OBJS = \
$(OBJDIR)\sc_test.obj
$(OBJDIR)\test_mutex.obj
MISC_OBJS= \
+ $(OBJDIR)\diag_map.obj \
+ $(OBJDIR)\base64.obj \
$(OBJDIR)\version.obj \
$(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\cclqual.obj \
$(OBJDIR)\cclstr.obj \
$(OBJDIR)\ccltoken.obj \
+ $(OBJDIR)\cclxmlconfig.obj \
$(OBJDIR)\ccl_stop_words.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
- $(OBJDIR)\waislen.obj \
$(OBJDIR)\ber_any.obj \
$(OBJDIR)\ber_bit.obj \
$(OBJDIR)\ber_bool.obj \
$(OBJDIR)\atoin.obj \
$(OBJDIR)\log.obj \
$(OBJDIR)\marcdisp.obj \
+ $(OBJDIR)\marc_read_json.obj \
$(OBJDIR)\marc_read_xml.obj \
$(OBJDIR)\marc_read_iso2709.obj \
$(OBJDIR)\marc_read_line.obj \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
+ $(OBJDIR)\wrbuf_sha1.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\sortspec.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
- $(OBJDIR)\opacdisp.obj \
+ $(OBJDIR)\opac_to_xml.obj \
+ $(OBJDIR)\xml_get.obj \
+ $(OBJDIR)\xml_add.obj \
+ $(OBJDIR)\xml_match.obj \
+ $(OBJDIR)\xml_to_opac.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
+ $(OBJDIR)\solr.obj \
+ $(OBJDIR)\solrtransform.obj \
+ $(OBJDIR)\sru_facet.obj \
$(OBJDIR)\srw.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-query.obj \
- $(OBJDIR)\record-render.obj \
+ $(OBJDIR)\record_render.obj \
$(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.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)\cookie.obj \
$(OBJDIR)\cql.obj \
+ $(OBJDIR)\cql2ccl.obj \
+ $(OBJDIR)\cql_sortkeys.obj \
$(OBJDIR)\cqlstdio.obj \
$(OBJDIR)\cqlstring.obj \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\rpn2cql.obj \
+ $(OBJDIR)\rpn2solr.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
$(OBJDIR)\match_glob.obj \
$(OBJDIR)\poll.obj \
$(OBJDIR)\daemon.obj \
+ $(OBJDIR)\iconv_encode_danmarc.obj \
$(OBJDIR)\iconv_encode_iso_8859_1.obj \
$(OBJDIR)\iconv_encode_marc8.obj \
$(OBJDIR)\iconv_decode_marc8.obj \
$(OBJDIR)\xml_include.obj \
$(OBJDIR)\file_glob.obj \
$(OBJDIR)\thread_id.obj \
- $(OBJDIR)\dirent.obj
+ $(OBJDIR)\dirent.obj \
+ $(OBJDIR)\url.obj \
+ $(OBJDIR)\backtrace.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
+STEMMER_OBJS = \
+ $(OBJDIR)\libstemmer.obj \
+ $(OBJDIR)\api.obj \
+ $(OBJDIR)\utilities.obj \
+ $(OBJDIR)\stem_UTF_8_porter.obj \
+ $(OBJDIR)\stem_UTF_8_english.obj
+
DLL_OBJS =\
$(MISC_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS) \
-
+ $(ILL_OBJS)
+
ICU_DLL_OBJS =\
$(OBJDIR)\icu_chain.obj \
$(OBJDIR)\icu_utf16.obj \
$(OBJDIR)\icu_transform.obj \
$(OBJDIR)\icu_casemap.obj \
$(OBJDIR)\icu_tokenizer.obj \
- $(OBJDIR)\icu_sortkey.obj
+ $(OBJDIR)\icu_sortkey.obj \
+ $(OBJDIR)\stemmer.obj \
+ $(STEMMER_OBJS)
# Generated C and H files
-Z3950_C_DIR=$(SRCDIR)
+Z3950_C_DIR=$(SRCDIR)
ILL_C_DIR=$(SRCDIR)
#!!! Should be moved to OBJ, but that requires too much trickery
$(SRCDIR)\diagsrw.c \
$(SRCDIR)\diagbib1.c \
$(SRCDIR)\diagsru_update.c \
- $(INCLDIR)\yaz\yaz-version.h
+ $(INCLDIR)\yaz\yaz-version.h
-# Compiling
+# Compiling
# Note: This defines where to look for the necessary
# source files. Funny way of doing it, but it works.
# Server
{$(SERVERDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
# Various YAZ source directories
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) /D"YAZ_DLL" $<
+ $(CPP) $(COPT) /D"YAZ_DLL" $<
{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(UTILDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
# ASN-generated files
@cd $(SRCDIR)
$(TCL) charconv.tcl -r -p iso5426 codetables-iso5426.xml -o iso5426.c
-$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
+$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
@cd $(SRCDIR)
$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
- $(TCL) csvtobib1.tcl $(SRCDIR)
+ $(TCL) csvtodiag.tcl bib1.csv diagbib1.c $(INCLDIR)\yaz\diagbib1.h bib1 diagbib1_str
$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
@cd $(SRCDIR)
- $(TCL) csvtosrw.tcl $(SRCDIR)
+ $(TCL) csvtodiag.tcl srw.csv diagsrw.c $(INCLDIR)\yaz\diagsrw.h srw
$(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
@cd $(SRCDIR)
$(TCL) csvtosru_update.tcl $(SRCDIR)
-$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/configure.ac
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
@cd $(SRCDIR)
- $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+ $(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
+
+version.nsi: $(ROOTDIR)/IDMETA
+ $(TCL) $(SRCDIR)/mk_version.tcl $(ROOTDIR)/IDMETA version.nsi
!endif
!endif
$(YAZ_RES): $(YAZ_RC)
- $(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
+ $(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
$(YAZ_ICU_RES): $(YAZ_RC)
- $(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC)
+ $(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC)
# Linking
$(DLL_OBJS) \
$(YAZ_RES) \
/out:$@ \
- /implib:"$(YAZ_IMPLIB)"
- $(MT) -manifest $@.manifest -outputresource:$@;2
+ /implib:"$(YAZ_IMPLIB)"
$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
- $(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
+ $(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
$(ICU_DLL_OBJS) \
$(YAZ_ICU_RES) \
/out:$@ \
- /implib:"$(YAZ_ICU_IMPLIB)"
- $(MT) -manifest $@.manifest -outputresource:$@;2
+ /implib:"$(YAZ_ICU_IMPLIB)"
$(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
$(LINK_DLL) $(COND_LIB) $(YAZ_IMPLIB)\
$(COND_DLL_OBJS) \
$(YAZ_COND_RES) \
/out:$@ \
- /implib:"$(YAZ_COND_IMPLIB)"
- $(MT) -manifest $@.manifest -outputresource:$@;2
+ /implib:"$(YAZ_COND_IMPLIB)"
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
- $(LINK_PROGRAM) $(ICU_LIB) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
+ $(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
+$(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL)
+ $(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@
$(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(ZTEST_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
-
$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_COND_DLL)
$(LINK_PROGRAM) $(YAZ_COND_IMPLIB) $(TEST_MUTEX_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
# Other rules
# check directories and create if needed
dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
-$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
+$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(JAVADIR):
if not exist "$@/$(NUL)" mkdir "$@"
projects / yaz-moved-to-github.git / blobdiff