-# Copyright (C) 1995-2007, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.133 2007-05-06 20:27:14 adam Exp $
-#
-# Programmed by
-# Heikki Levanto & Adam Dickmeiss
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2013 Index Data
# Parameters
DEBUG=0 # 0 for release, 1 for debug
+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
HAVE_ICONV=1
ICONV_DIR = c:\iconv-1.9.2.win32
+# icu charcter conversion utility
+# get icu libraries from http://www.icu-project.org
+HAVE_ICU=1
+ICU_LIB = c:\icu\lib
+ICU_BIN = c:\icu\bin
+ICU_INCLUDE = c:\icu\include
+
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.17.win32
+LIBXSLT_DIR=c:\libxslt-1.1.26.win32
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.26.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.win32
# zlib compression (used by libxml2)
ZLIB_DIR = c:\zlib-1.2.3.win32
default: all
-all: dirs generate dll client ztest zoomsh utilprog testprog iconv libxml2 libxslt
+all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
+ testprog iconv icu libxml2 libxslt yaz_url
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
-dist:
+dist: yaz.win32.nsi yaz.nsi distclean
+ nmake DEBUG=0
+ $(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+ nmake make64
+ $(NSIS) yaz.win64.nsi
+
+make64:
+ nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64
+
+distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=0
- $(NSIS) yaz.nsi
-nsis:
- $(NSIS) yaz.nsi
+nsis: all yaz32.nsi
+ $(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+ $(NSIS) yaz.win64.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)
-DLL=$(BINDIR)\yaz3d.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3d.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
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4d.lib
!else
-DLL=$(BINDIR)\yaz3.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3.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
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.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
ZOOMTST1=$(BINDIR)\zoomtst1.exe
ZOOMTST2=$(BINDIR)\zoomtst2.exe
CQL2XCQL=$(BINDIR)\cql2xcql.exe
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
-TSTLOG=$(BINDIR)\tstlog.exe
-TST_TIMING=$(BINDIR)\tst_timing.exe
+TSTLOG=$(BINDIR)\test_log.exe
+TST_TIMING=$(BINDIR)\test_timing.exe
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
# shortcut names defined here
-dll: dirs generate $(DLL)
+dll: dirs generate $(YAZ_DLL) $(YAZ_COND_DLL)
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
+sc_test: $(SC_TEST)
+
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
$(ZOOMTST10)
-utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
+yaz_url: $(YAZ_URL)
-testprog: $(TSTLOG) $(TST_TIMING)
+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_INCLUDE)"
+ICU_LIBS= \
+ $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
+icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
+yazicu: dirs generate $(YAZ_ICU)
+
+$(BINDIR)\icudt42.dll:
+ copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
+$(BINDIR)\icuin42.dll:
+ copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
+$(BINDIR)\icuuc42.dll:
+ copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
+!else
+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"
COMMON_C_OPTIONS= \
/nologo /W3 /EHsc /FD /c \
$(ICONV_DEF) \
+ $(ICU_DEF) \
$(LIBXML2_DEF) \
$(LIBXSLT_DEF) \
/D "_CRT_SECURE_NO_DEPRECATE" \
/Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
- /I"$(ROOTDIR)\include"
+ /I"$(ROOTDIR)\include" \
+ /I"$(ROOTDIR)\libstemmer_c\include"
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
### Linker options
LINK=link.exe
-LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
- advapi32.lib uuid.lib wsock32.lib advapi32.lib \
- $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+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
# Final opt variables
!if $(DEBUG)
COPT= $(COMMON_C_OPTIONS) $(DEBUG_C_OPTIONS) $(COMMON_C_INCLUDES)
-MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS)
-RCOPT= $(COMMON_RC_OPTIONS) $(DEBUG_RC_OPTIONS)
LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS) $(LNK_LIBS)
TCLOPT= $(COMMON_TCL_OPTIONS)
!else
COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES)
-MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS)
-RCOPT= $(COMMON_RC_OPTIONS) $(RELEASE_RC_OPTIONS)
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
TCLOPT= $(COMMON_TCL_OPTIONS)
!endif
$(OBJDIR)\admin.obj \
$(OBJDIR)\fhistory.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
+SC_TEST_OBJS = \
+ $(OBJDIR)\sc_test.obj
+
YAZ_ZOOMSH_OBJS = \
$(OBJDIR)\zoomsh.obj
YAZ_MARCDUMP_OBJS = \
$(OBJDIR)\marcdump.obj
+
TSTLOG_OBJS = \
- $(OBJDIR)\tstlog.obj
+ $(OBJDIR)\test_log.obj
TST_TIMING_OBJS = \
- $(OBJDIR)\tst_timing.obj
+ $(OBJDIR)\test_timing.obj
+
+TEST_MUTEX_OBJS = \
+ $(OBJDIR)\test_mutex.obj
MISC_OBJS= \
+ $(OBJDIR)\diag_map.obj \
+ $(OBJDIR)\base64.obj \
$(OBJDIR)\version.obj \
$(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
- $(OBJDIR)\service.obj \
$(OBJDIR)\seshigh.obj \
$(OBJDIR)\statserv.obj \
$(OBJDIR)\tcpdchk.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)\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)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
+ $(OBJDIR)\iso5428.obj \
+ $(OBJDIR)\utf8.obj \
+ $(OBJDIR)\ucs4.obj \
+ $(OBJDIR)\advancegreek.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)\sortspec.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
- $(OBJDIR)\opacdisp.obj \
+ $(OBJDIR)\opac_to_xml.obj \
+ $(OBJDIR)\xml_to_opac.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
+ $(OBJDIR)\solr.obj \
+ $(OBJDIR)\solrtransform.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-event.obj \
+ $(OBJDIR)\zoom-record-cache.obj \
+ $(OBJDIR)\zoom-z3950.obj \
+ $(OBJDIR)\zoom-sru.obj \
+ $(OBJDIR)\zoom-query.obj \
+ $(OBJDIR)\record_render.obj \
+ $(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
+ $(OBJDIR)\init_diag.obj \
$(OBJDIR)\xmlquery.obj \
+ $(OBJDIR)\xmlerror.obj \
$(OBJDIR)\mime.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)\uri.obj \
$(OBJDIR)\query-charset.obj \
$(OBJDIR)\tokenizer.obj \
$(OBJDIR)\copy_types.obj \
- $(OBJDIR)\http.obj
+ $(OBJDIR)\http.obj \
+ $(OBJDIR)\match_glob.obj \
+ $(OBJDIR)\poll.obj \
+ $(OBJDIR)\daemon.obj \
+ $(OBJDIR)\iconv_encode_iso_8859_1.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)\thread_create.obj \
+ $(OBJDIR)\spipe.obj \
+ $(OBJDIR)\gettimeofday.obj \
+ $(OBJDIR)\json.obj \
+ $(OBJDIR)\sc.obj \
+ $(OBJDIR)\xml_include.obj \
+ $(OBJDIR)\file_glob.obj \
+ $(OBJDIR)\thread_id.obj \
+ $(OBJDIR)\dirent.obj \
+ $(OBJDIR)\url.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
$(OBJDIR)\prt-ext.obj \
$(OBJDIR)\z-charneg.obj \
$(OBJDIR)\z-mterm2.obj \
- $(OBJDIR)\z-oclcui.obj
+ $(OBJDIR)\z-oclcui.obj \
+ $(OBJDIR)\z-facet-1.obj
ILL_OBJS= \
$(OBJDIR)\ill-get.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_utf8.obj \
+ $(OBJDIR)\icu_transform.obj \
+ $(OBJDIR)\icu_casemap.obj \
+ $(OBJDIR)\icu_tokenizer.obj \
+ $(OBJDIR)\icu_sortkey.obj \
+ $(OBJDIR)\stemmer.obj \
+ $(STEMMER_OBJS)
# Generated C and H files
OCLCUI_H_FILES = $(INCLDIR)\yaz\z-oclcui.h
OCLCUI_C_FILES = $(Z3950_C_DIR)\z-oclcui.c
+# Files generated from facet.asn
+FACET_H_FILES = $(INCLDIR)\yaz\z-facet-1.h
+FACET_C_FILES = $(Z3950_C_DIR)\z-facet-1.c
+
# Files created from z3950v3.asn
Z3950V3_H_FILES= \
$(INCLDIR)\yaz\z-accdes1.h \
CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
OCLCUI_FILES = $(OCLCUI_C_FILES) $(OCLCUI_H_FILES)
+FACET_FILES = $(FACET_C_FILES) $(FACET_H_FILES)
GENERATED_C_FILES= \
$(Z3950V3_C_FILES) \
$(CHARNEG_C_FILES) \
$(MTERM2_C_FILES) \
$(OCLCUI_C_FILES) \
+ $(FACET_C_FILES) \
$(ILL_CORE_C_FILES) \
$(ITEM_REQ_C_FILES)
$(CHARNEG_H_FILES) \
$(MTERM2_H_FILES) \
$(OCLCUI_H_FILES) \
+ $(FACET_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
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(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
!if $(HAVE_TCL)
$(TCL) $(TCLOPT) -d z.tcl oclcui.asn
@cd $(WINDIR)
+$(FACET_FILES): $(SRCDIR)\facet.asn
+ @cd $(SRCDIR)
+ $(TCL) $(TCLOPT) -d z.tcl facet.asn
+ @cd $(WINDIR)
+
$(ILL_CORE_FILES): $(SRCDIR)\ill9702.asn
@cd $(SRCDIR)
$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@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)/IDMETA
+ @cd $(SRCDIR)
+ $(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
+
+
!endif
!if $(HAVE_BISON)
# Resources
# The RC compiler (resource files)
RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)"
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
-YAZ_RES=$(OBJDIR)\yaz.res
YAZ_RC=$(WINDIR)\yaz.rc
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_ICU_RES=$(OBJDIR)\yaz_icu.res
!if $(DEBUG)
RSOPT=/d_DEBUG
!endif
$(YAZ_RES): $(YAZ_RC)
- $(RSC) $(RSOPT) /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)
# Linking
-$(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
+$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
$(LINK_DLL) \
$(DLL_OBJS) \
$(YAZ_RES) \
- /out:$(DLL) \
+ /out:$@ \
/implib:"$(YAZ_IMPLIB)"
-
-$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$(CLIENT)
-
-$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$(ZOOMSH)
-
-$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$(ZOOMTST1)
-
-$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$(ZOOMTST2)
-
-$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$(ZOOMTST3)
-
-$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$(ZOOMTST4)
-
-$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$(ZOOMTST5)
-
-$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$(ZOOMTST6)
-
-$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$(ZOOMTST7)
-
-$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$(ZOOMTST8)
-
-$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$(ZOOMTST9)
-
-$(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$(ZOOMTST10)
-
-$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$(CQL2PQF)
-
-$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$(CQL2XCQL)
-
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
- $(LINK_PROGRAM) $(ZTEST_OBJS) /out:$(ZTEST)
-
-$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
- $(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$(YAZ_MARCDUMP)
-
-$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
- $(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$(TSTLOG)
-
-$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(DLL)
- $(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$(TST_TIMING)
+ $(MT) -manifest $@.manifest -outputresource:$@;2
+
+$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
+ $(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
+ $(ICU_DLL_OBJS) \
+ $(YAZ_ICU_RES) \
+ /out:$@ \
+ /implib:"$(YAZ_ICU_IMPLIB)"
+ $(MT) -manifest $@.manifest -outputresource:$@;2
+
+$(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
+
+$(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_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
+
+$(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL)
+ $(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
+
+$(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
projects / yaz-moved-to-github.git / blobdiff