-# Copyright (C) 1994-2003, Index Data
-# All rights reserved.
-# $Id: makefile,v 1.64 2003-09-04 18:52:02 adam Exp $
-#
-# Programmed by
-# HL: Heikki Levanto, Index Data
-#
-
-###########################################################
-############### Parameters
-###########################################################
+# This file is part of the YAZ toolkit.
+# Copyright (C) Index Data
+
+# Parameters
DEBUG=0 # 0 for release, 1 for debug
+USE_MANIFEST = 1
# TCL
-TCL="C:\Tcl\bin\tclsh84.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.8.win32
+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.26.win32
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.5.10.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.win32
+
+# zlib compression (used by libxml2)
+ZLIB_DIR = c:\zlib-1.2.3.win32
-# WIN32 binaries libxml2 & iconv from here:
-# http://www.zlatkovic.com/projects/libxml/binaries.html
+# get WIN32 binaries libxml2 & iconv & zlib from here:
+# http://www.zlatkovic.com/libxml.en.html
# bison
HAVE_BISON=1
default: all
-all: dirs generate dll client ztest zoomsh cqlprog iconv libxml2
+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"
+
+YAZ4J_DIR="..\..\yaz4j"
+
+YAZPATH="$(MAKEDIR)\.."
+
+
+dist: yaz.win32.nsi yaz.nsi distclean
+ nmake DEBUG=0 all yaz4j
+ $(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 YAZ4J_DIR=..\..\..\yaz4j all yaz4j
+
+
+distclean:
+ nmake DEBUG=1 clean
+ nmake DEBUG=0 clean
-NSIS="c:\program files\nsis\makensis-bz2.exe"
+nsis: all yaz.win32.nsi
+ $(NSIS) yaz.win32.nsi
-nsis: all
- $(NSIS) yaz.nsi
+nsis64: yaz.win64.nsi
+ $(NSIS) yaz.win64.nsi
nsishelp:
$(NSIS)
-generate: generated_files
-
-###########################################################
-############### Directories
-###########################################################
+# Directories
# The current directory is supposed to be something like
# ..../yaz/win, everything is relative to that
ROOTDIR=.. # The home of yaz
LIBDIR=$(ROOTDIR)\lib # We produce .lib, .exp etc there
BINDIR=$(ROOTDIR)\bin # We produce exes and dlls there
WINDIR=$(ROOTDIR)\win # all these Win make things
-OBJDIR=$(WINDIR)\obj # where we store intermediate files
-UNIXDIR=$(ROOTDIR)\unix # corresponding unix things
-SRCDIR=$(ROOTDIR) # for the case we move them under src
-
-ASNDIR=$(SRCDIR)\ASN
-COMSTACKDIR=$(SRCDIR)\COMSTACK
-ODRDIR=$(SRCDIR)\ODR
-UTILDIR=$(SRCDIR)\UTIL
-ZUTILDIR=$(SRCDIR)\ZUTIL
-RETDIR=$(SRCDIR)\RETRIEVAL
-Z3950DIR=$(SRCDIR)\Z39.50
-ILLDIR=$(SRCDIR)\ill
-CCLDIR=$(SRCDIR)\ccl
-ZOOMDIR=$(SRCDIR)\zoom
-CQLDIR=$(SRCDIR)\cql
+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)
+OBJDIR=$(WINDIR)\dobj
+!else
+OBJDIR=$(WINDIR)\obj
+!endif
-CLIENTDIR=$(SRCDIR)\CLIENT
-SERVERDIR=$(SRCDIR)\SERVER
-ZTESTDIR=$(SRCDIR)\ZTEST
+CLIENTDIR=$(ROOTDIR)\CLIENT
+ZTESTDIR=$(ROOTDIR)\ZTEST
+ZOOMDIR=$(ROOTDIR)\ZOOM
+UTILDIR=$(ROOTDIR)\UTIL
+TESTDIR=$(ROOTDIR)\TEST
-TMPDIR=$(ROOTDIR)\win\tmp
-TMP=$(TMPDIR)
+# TMPDIR=$(ROOTDIR)\win\tmp
+# TMP=$(TMPDIR)
-###########################################################
-############### Targets - what to make
-###########################################################
+# Targets - what to make
-DLL=$(BINDIR)\yaz.dll
-IMPLIB=$(LIBDIR)\yaz.lib
+!if $(DEBUG)
+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)\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
ZOOMTST1=$(BINDIR)\zoomtst1.exe
ZOOMTST2=$(BINDIR)\zoomtst2.exe
ZOOMTST6=$(BINDIR)\zoomtst6.exe
ZOOMTST7=$(BINDIR)\zoomtst7.exe
ZOOMTST8=$(BINDIR)\zoomtst8.exe
+ZOOMTST9=$(BINDIR)\zoomtst9.exe
+ZOOMTST10=$(BINDIR)\zoomtst10.exe
CQL2PQF=$(BINDIR)\cql2pqf.exe
CQL2XCQL=$(BINDIR)\cql2xcql.exe
+YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
+
+TSTLOG=$(BINDIR)\test_log.exe
+TST_TIMING=$(BINDIR)\test_timing.exe
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
# shortcut names defined here
-dll : $(DLL)
-client: $(CLIENT)
-ztest: $(ZTEST)
+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)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
+ $(ZOOMTST10)
+
+yaz_url: $(YAZ_URL)
+
+utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
-cqlprog: $(CQL2PQF) $(CQL2XCQL)
+htmlhelp: $(DOCDIR)\htmlhelp.chm
-###########################################################
-############### Compiler and linker options
-###########################################################
+# Modules and conditional flags, etc
!if $(HAVE_ICONV)
ICONV_DEF= \
/D HAVE_ICONV_H=1 \
/I"$(ICONV_DIR)\include"
ICONV_LIB= \
- $(ICONV_DIR)\lib\iconv.lib
+ "$(ICONV_DIR)\lib\iconv.lib"
iconv: $(BINDIR)\iconv.dll
$(BINDIR)\iconv.dll:
- copy $(ICONV_DIR)\lib\iconv.dll $(BINDIR)
+ copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
!else
ICONV_DEF= \
/D HAVE_ICONV_H=0
!endif
+!if $(HAVE_ICU)
+ICU_DEF= \
+ /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
+ICU_VER=42
+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_LIBS=
+icu:
+yazicu:
+!endif
+
+###
+
!if $(HAVE_LIBXML2)
-LIBXML2_LIB=$(LIBXML2_DIR)\lib\libxml2.lib
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll
+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
$(BINDIR)\libxml2.dll:
- copy $(LIBXML2_DIR)\lib\libxml2.dll $(BINDIR)
+ copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
+
+$(BINDIR)\zlib1.dll:
+ copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
+
!else
LIBXML2_LIB=
-LIBXML2_DEF=/D HAVE_XML2=0
-libxml2:
+LIBXML2_DEF=/D YAZ_HAVE_XML2=0
+libxml2:
!endif
+!if $(HAVE_LIBXSLT)
+LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
+LIBXSLT_DEF= \
+ /D HAVE_XSLTSAVERESULTTOSTRING=1 \
+ /D YAZ_HAVE_XSLT=1 \
+ /I"$(LIBXSLT_DIR)\include"
+libxslt: $(BINDIR)\libxslt.dll
+
+$(BINDIR)\libxslt.dll:
+ copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+
+!else
+LIBXSLT_LIB=
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
+libxslt:
+!endif
+
### C and CPP compiler (the same thing)
# Note: $(CPP) has already been defined in the environment
# (if you set things up right!)
COMMON_C_OPTIONS= \
- /nologo /W3 /GX /FD /c \
+ /nologo /W3 /EHsc /FD /c \
$(ICONV_DEF) \
+ $(ICU_DEF) \
$(LIBXML2_DEF) \
+ $(LIBXSLT_DEF) \
+ /D "_CRT_SECURE_NO_DEPRECATE" \
+ /D "_CRT_NONSTDC_NO_DEPRECATE" \
/D "_WINDOWS" \
/D "WIN32" \
- /D "HAVE_WCHAR_H=1" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
- /Fd"$(OBJDIR)\\"
+ /Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
- /I"$(SRCDIR)\include"
+ /I"$(ROOTDIR)\include" \
+ /I"$(ROOTDIR)\libstemmer_c\include"
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
- /MDd /Od /YX /Zi /Gm
+ /MDd /Od /Zi /Gm
RELEASE_C_OPTIONS= \
/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
-# /YX = Automatic use of precomipled headers
-# /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
-LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
- advapi32.lib uuid.lib \
- wsock32.lib advapi32.lib \
- $(ICONV_LIB) $(LIBXML2_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)
-DEBUG_LNK_OPTIONS= /debug
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
-RELEASE_LNK_OPTIONS= /pdb:none
+DEBUG_LNK_OPTIONS= /debug
-DLL_LINK_OPTIONS= /dll
-CLIENT_LINK_OPTIONS = /subsystem:console
-ZOOMSH_LINK_OPTIONS = /subsystem:console
-SERVER_LINK_OPTIONS = -lib
-ZTEST_LINK_OPTIONS = /subsystem:console
-CQL2PQF_LINK_OPTIONS = /subsystem:console
-CQL2XCQL_LINK_OPTIONS = /subsystem:console
+RELEASE_LNK_OPTIONS=
+DLL_LINK_OPTIONS= /dll
+CLIENT_LINK_OPTIONS = /subsystem:console
COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
# 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)
+COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES)
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
TCLOPT= $(COMMON_TCL_OPTIONS)
!endif
+LINK_PROGRAM = $(LINK) $(LNKOPT) \
+ $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZ_IMPLIB)
+LINK_DLL = $(LINK) $(LNKOPT) \
+ $(LINK_LIBS) $(DLL_LINK_OPTIONS)
-###########################################################
-############### Source and object modules
-###########################################################
+# 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
YAZ_CLIENT_OBJS= \
$(OBJDIR)\client.obj \
$(OBJDIR)\tabcomplete.obj \
- $(OBJDIR)\admin.obj
+ $(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
$(OBJDIR)\zoomtst7.obj
YAZ_ZOOMTST8_OBJS = \
$(OBJDIR)\zoomtst8.obj
+YAZ_ZOOMTST9_OBJS = \
+ $(OBJDIR)\zoomtst9.obj
+YAZ_ZOOMTST10_OBJS = \
+ $(OBJDIR)\zoomtst10.obj
YAZ_CQL2PQF_OBJS = \
$(OBJDIR)\cql2pqf.obj
YAZ_CQL2XCQL_OBJS = \
$(OBJDIR)\cql2xcql.obj
+YAZ_MARCDUMP_OBJS = \
+ $(OBJDIR)\marcdump.obj
-YAZ_SERVER_OBJS= \
- "$(OBJDIR)\eventl.obj" \
- "$(OBJDIR)\requestq.obj" \
- "$(OBJDIR)\service.obj" \
- "$(OBJDIR)\seshigh.obj" \
- "$(OBJDIR)\statserv.obj" \
- "$(OBJDIR)\tcpdchk.obj"
-ZTEST_OBJS= \
- "$(OBJDIR)\read-marc.obj" \
- "$(OBJDIR)\read-grs.obj" \
- "$(OBJDIR)\ztest.obj"
+TSTLOG_OBJS = \
+ $(OBJDIR)\test_log.obj
-YAZ_CCL_OBJS= \
+TST_TIMING_OBJS = \
+ $(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)\seshigh.obj \
+ $(OBJDIR)\statserv.obj \
+ $(OBJDIR)\tcpdchk.obj \
$(OBJDIR)\cclerrms.obj \
$(OBJDIR)\cclfind.obj \
$(OBJDIR)\cclptree.obj \
$(OBJDIR)\cclqfile.obj \
$(OBJDIR)\cclqual.obj \
$(OBJDIR)\cclstr.obj \
- $(OBJDIR)\ccltoken.obj
-
-YAZ_COMSTACK_OBJS= \
+ $(OBJDIR)\ccltoken.obj \
+ $(OBJDIR)\cclxmlconfig.obj \
+ $(OBJDIR)\ccl_stop_words.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
- $(OBJDIR)\waislen.obj
-
-YAZ_ODR_OBJS= \
$(OBJDIR)\ber_any.obj \
$(OBJDIR)\ber_bit.obj \
$(OBJDIR)\ber_bool.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_seq.obj \
$(OBJDIR)\odr_tag.obj \
$(OBJDIR)\odr_use.obj \
- $(OBJDIR)\odr_util.obj
-
-YAZ_UTIL_OBJS= \
- $(OBJDIR)\version.obj \
+ $(OBJDIR)\odr_util.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)\nmem.obj \
$(OBJDIR)\nmemsdup.obj \
- $(OBJDIR)\oid.obj \
+ $(OBJDIR)\oid_db.obj \
+ $(OBJDIR)\oid_util.obj \
$(OBJDIR)\options.obj \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
+ $(OBJDIR)\wrbuf_sha1.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
- $(OBJDIR)\marc8.obj
-
-YAZ_ZUTIL_OBJS= \
+ $(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)\test.obj \
$(OBJDIR)\diagbib1.obj \
+ $(OBJDIR)\diagsru_update.obj \
+ $(OBJDIR)\diagsrw.obj \
+ $(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
+ $(OBJDIR)\querytowrbuf.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
$(OBJDIR)\sortspec.obj \
- $(OBJDIR)\z3950oid.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
- $(OBJDIR)\opacdisp.obj \
+ $(OBJDIR)\opac_to_xml.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-opt.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)\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)\uri.obj \
+ $(OBJDIR)\query-charset.obj \
+ $(OBJDIR)\tokenizer.obj \
+ $(OBJDIR)\copy_types.obj \
+ $(OBJDIR)\http.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)\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
-YAZ_CQL_OBJS = \
- $(OBJDIR)\cql.obj \
- $(OBJDIR)\cqlstdio.obj \
- $(OBJDIR)\cqlstring.obj \
- $(OBJDIR)\cqltransform.obj \
- $(OBJDIR)\cqlutil.obj \
- $(OBJDIR)\cqlstrer.obj \
- $(OBJDIR)\xcqlutil.obj
+STEMMER_OBJS = \
+ $(OBJDIR)\libstemmer.obj \
+ $(OBJDIR)\api.obj \
+ $(OBJDIR)\utilities.obj \
+ $(OBJDIR)\stem_UTF_8_porter.obj \
+ $(OBJDIR)\stem_UTF_8_english.obj
-YAZ_OBJS =\
- $(YAZ_UTIL_OBJS) \
- $(YAZ_ODR_OBJS) \
- $(YAZ_COMSTACK_OBJS) \
+DLL_OBJS =\
+ $(MISC_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS) \
- $(YAZ_ZUTIL_OBJS) \
- $(YAZ_CCL_OBJS) \
- $(YAZ_CQL_OBJS) \
- $(YAZ_SERVER_OBJS)
-
-DLL_OBJS= $(YAZ_OBJS)
-
-ALL_OBJS= \
- $(YAZ_OBJS) \
- $(YAZ_CLIENT_OBJS) \
- $(ZTEST_OBJS)
-
-###########################################################
-############### Generated C and H files
-#####
-######################################################
-
-Z3950_C_DIR=$(Z3950DIR)
-ILL_C_DIR=$(ILLDIR)
+ $(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
+
+Z3950_C_DIR=$(SRCDIR)
+ILL_C_DIR=$(SRCDIR)
#!!! Should be moved to OBJ, but that requires too much trickery
# Files generated from datetime.asn
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) \
$(ESADMIN_C_FILES) \
$(CHARNEG_C_FILES) \
$(MTERM2_C_FILES) \
- $(OCLCUI_C_FILES)
+ $(OCLCUI_C_FILES) \
+ $(FACET_C_FILES) \
+ $(ILL_CORE_C_FILES) \
+ $(ITEM_REQ_C_FILES)
GENERATED_H_FILES= \
$(Z3950V3_H_FILES) \
$(ESADMIN_H_FILES) \
$(CHARNEG_H_FILES) \
$(MTERM2_H_FILES) \
- $(OCLCUI_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 \
+ $(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.
-# DLL sources
-{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
-
# yaz client
{$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $< /D"_CONSOLE"
+ $(CPP) $(COPT) $< /D"_CONSOLE"
# Ztest
{$(ZTESTDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $< /D"_CONSOLE"
+ $(CPP) $(COPT) $< /D"_CONSOLE"
# Server
{$(SERVERDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
# Various YAZ source directories
-{$(ASNDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
-
-{$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+{$(SRCDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) /D"YAZ_DLL" $<
-{$(ODRDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
{$(UTILDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
-
-{$(ZUTILDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
-
-{$(RETDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
-{$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
-
-{$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+{$(TESTDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
-{$(CCLDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
-{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
-{$(CQLDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
-############### ASN-generated files
+# ASN-generated files
!if $(HAVE_TCL)
-$(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
- @cd $(Z3950DIR)
+$(Z3950V3_FILES): $(SRCDIR)\z3950v3.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
@cd $(WINDIR)
-$(DATETIME_FILES): $(Z3950DIR)\datetime.asn
- @cd $(Z3950DIR)
+$(DATETIME_FILES): $(SRCDIR)\datetime.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl datetime.asn
@cd $(WINDIR)
-$(UNIVRES_FILES): $(Z3950DIR)\univres.asn
- @cd $(Z3950DIR)
+$(UNIVRES_FILES): $(SRCDIR)\univres.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl univres.asn
@cd $(WINDIR)
-$(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn
- @cd $(Z3950DIR)
+$(ESUPDATE_FILES): $(SRCDIR)\esupdate.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl esupdate.asn
@cd $(WINDIR)
-$(ESADMIN_FILES): $(Z3950DIR)\esadmin.asn
- @cd $(Z3950DIR)
+$(ESADMIN_FILES): $(SRCDIR)\esadmin.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl esadmin.asn
@cd $(WINDIR)
-$(CHARNEG_FILES): $(Z3950DIR)\charneg-3.asn
- @cd $(Z3950DIR)
+$(CHARNEG_FILES): $(SRCDIR)\charneg-3.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl charneg-3.asn
@cd $(WINDIR)
-$(MTERM2_FILES): $(Z3950DIR)\mterm2.asn
- @cd $(Z3950DIR)
+$(MTERM2_FILES): $(SRCDIR)\mterm2.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl mterm2.asn
@cd $(WINDIR)
-$(OCLCUI_FILES): $(Z3950DIR)\oclcui.asn
- @cd $(Z3950DIR)
+$(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d z.tcl oclcui.asn
@cd $(WINDIR)
-$(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
- @cd $(ILLDIR)
+$(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 $(WINDIR)
-$(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
- @cd $(ILLDIR)
+$(ITEM_REQ_FILES): $(SRCDIR)\item-req.asn
+ @cd $(SRCDIR)
$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
@cd $(WINDIR)
-$(UTILDIR)\marc8.c: $(UTILDIR)\charconv.sgm
- @cd $(UTILDIR)
- $(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+$(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
+ @cd $(SRCDIR)
+ $(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
+
+$(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
+ @cd $(SRCDIR)
+ $(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+
+$(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
+
+$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtodiag.tcl bib1.csv diagbib1.c $(INCLDIR)\yaz\diagbib1.h bib1 diagbib1_str
+
+$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
+ @cd $(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)/IDMETA
+ @cd $(SRCDIR)
+ $(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
+
!endif
!if $(HAVE_BISON)
-$(CQLDIR)\cql.c: $(CQLDIR)\cql.y
- @cd $(CQLDIR)
+$(SRCDIR)\cql.c: $(SRCDIR)\cql.y
+ @cd $(SRCDIR)
$(BISON) -y -p cql_ -o cql.c cql.y
!endif
-###########################################################
-############### Resources
-###########################################################
-
-### The RC compiler (resource files)
+# 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)
-
-###########################################################
-############### Linking
-###########################################################
-
-$(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
- @echo Linking the dll $(DLL)
- $(LINK) @<<
- $(LNKOPT)
- $(LINK_LIBS)
- $(DLL_LINK_OPTIONS)
- $(DLL_OBJS)
- $(YAZ_RES)
- /out:$(DLL)
- /implib:"$(LIBDIR)\yaz.lib"
- /pdb:"$(LIBDIR)\yaz.pdb"
- /map:"$(LIBDIR)\yaz.map"
-<<
-
-$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS)
- @echo Linking $(CLIENT)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_CLIENT_OBJS)
- /pdb:"$(LIBDIR)\yaz-client.pdb"
- /map:"$(LIBDIR)\yaz-client.map"
- /out:$(CLIENT)
-<<
-
-$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS)
- @echo Linking $(ZOOMSH)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMSH_OBJS)
- /pdb:"$(LIBDIR)\zoomsh.pdb"
- /map:"$(LIBDIR)\zoomsh.map"
- /out:$(ZOOMSH)
-<<
-
-$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS)
- @echo Linking $(ZOOMTST1)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST1_OBJS)
- /pdb:"$(LIBDIR)\zoomtst1.pdb"
- /map:"$(LIBDIR)\zoomtst1.map"
- /out:$(ZOOMTST1)
-<<
-
-$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS)
- @echo Linking $(ZOOMTST2)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST2_OBJS)
- /pdb:"$(LIBDIR)\zoomtst2.pdb"
- /map:"$(LIBDIR)\zoomtst2.map"
- /out:$(ZOOMTST2)
-<<
-
-$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS)
- @echo Linking $(ZOOMTST3)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST3_OBJS)
- /pdb:"$(LIBDIR)\zoomtst3.pdb"
- /map:"$(LIBDIR)\zoomtst3.map"
- /out:$(ZOOMTST3)
-<<
-
-$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS)
- @echo Linking $(ZOOMTST4)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST4_OBJS)
- /pdb:"$(LIBDIR)\zoomtst4.pdb"
- /map:"$(LIBDIR)\zoomtst4.map"
- /out:$(ZOOMTST4)
-<<
-
-$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS)
- @echo Linking $(ZOOMTST5)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST5_OBJS)
- /pdb:"$(LIBDIR)\zoomtst5.pdb"
- /map:"$(LIBDIR)\zoomtst5.map"
- /out:$(ZOOMTST5)
-<<
-
-$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS)
- @echo Linking $(ZOOMTST6)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST6_OBJS)
- /pdb:"$(LIBDIR)\zoomtst6.pdb"
- /map:"$(LIBDIR)\zoomtst6.map"
- /out:$(ZOOMTST6)
-<<
-
-$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS)
- @echo Linking $(ZOOMTST7)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST7_OBJS)
- /pdb:"$(LIBDIR)\zoomtst7.pdb"
- /map:"$(LIBDIR)\zoomtst7.map"
- /out:$(ZOOMTST7)
-<<
-
-$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
- @echo Linking $(ZOOMTST8)
- $(LINK) @<<
- $(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST8_OBJS)
- /pdb:"$(LIBDIR)\zoomtst8.pdb"
- /map:"$(LIBDIR)\zoomtst8.map"
- /out:$(ZOOMTST8)
-<<
-
-$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS)
- @echo Linking $(CQL2PQF)
- $(LINK) @<<
- $(LNKOPT)
- $(CQL2PQF_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_CQL2PQF_OBJS)
- /pdb:"$(LIBDIR)\cql2pqf.pdb"
- /map:"$(LIBDIR)\cql2pqf.map"
- /out:$(CQL2PQF)
-<<
-
-$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS)
- @echo Linking $(CQL2XCQL)
- $(LINK) @<<
- $(LNKOPT)
- $(CQL2XCQL_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_CQL2XCQL_OBJS)
- /pdb:"$(LIBDIR)\cql2xcql.pdb"
- /map:"$(LIBDIR)\cql2xcql.map"
- /out:$(CQL2XCQL)
-<<
-
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
- @echo Linking the ztest $(ZTEST)
- $(LINK) @<<
- $(LNKOPT)
- $(ZTEST_LINK_OPTIONS)
- $(LINK_LIBS)
- shell32.lib
- $(IMPLIB)
- $(ZTEST_OBJS)
- /implib:"$(LIBDIR)\yaz-ztest.lib"
- /pdb:"$(LIBDIR)\yaz-ztest.pdb"
- /map:"$(LIBDIR)\yaz-ztest.map"
- /out:$(ZTEST)
-<<
-
-# note that this links a lib, so it uses completely different options.
-
-###########################################################
-############### Special operations
-###########################################################
-
-
-############## clean
+ $(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
+
+$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
+ $(LINK_DLL) \
+ $(DLL_OBJS) \
+ $(YAZ_RES) \
+ /out:$@ \
+ /implib:"$(YAZ_IMPLIB)"
+ $(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
+
+$(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp
+ @cd $(DOCDIR)
+ -$(HHC) htmlhelp.hhp
+ @cd $(WINDIR)
+
clean:
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
+ -del $(BINDIR)\*.pdb
-del $(TMPDIR)\*.
- -del $(LIBDIR)\*.MAP
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
realclean: clean
- -del $(CQLDIR)\cql.c
- -del $(Z3950_C_DIR)\z*.c
+ -del $(SRCDIR)\marc8.c
+ -del $(SRCDIR)\cql.c
+ -del $(SRCDIR)\z-*.c
+ -del $(SRCDIR)\ill-core.c
+ -del $(SRCDIR)\item-req.c
+ -del $(INCLDIR)\yaz\ill-core.h
+ -del $(INCLDIR)\yaz\item-req.h
-del $(INCLDIR)\yaz\z-accdes1.h
-del $(INCLDIR)\yaz\z-core.h
-del $(DATETIME_H_FILES)
# the _H_ files work only on sets that have just one file.
# Z3950_H_FILES had to be spelled out. One more point for MS!
-########### check directories and create if needed
+# 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 "$@"
-###########################################################
-############### Explicit dependencies
-###########################################################
+# Explicit dependencies
# force recompilation of everything, if makefile changed
# new proto.h refers to the generated files, and is included
# in various places
-###########################################################
-############### Log
-###########################################################
-#
-# $Log: makefile,v $
-# Revision 1.64 2003-09-04 18:52:02 adam
-# Minor changes. Use libxml-2.5.10
-#
-# Revision 1.63 2003/07/25 11:11:19 adam
-# Change order of compilation to reflect Unix AM.
-#
-# Revision 1.62 2003/07/19 13:48:49 adam
-# makefile updated for oclcui.asn
-#
-# Revision 1.61 2003/07/15 08:26:26 adam
-# opacdisp.obj
-#
-# Revision 1.60 2003/06/11 18:37:10 adam
-# Dont use charconv_cjk.xml
-#
-# Revision 1.59 2003/06/03 09:11:13 adam
-# WIN32 updates
-#
-# Revision 1.58 2003/06/02 13:44:54 adam
-# Added cqlstrer to win makefile
-#
-# Revision 1.57 2003/05/27 21:12:23 adam
-# YAZ ASN.1 compiler renamed from yaz-comp to yaz-asncomp
-#
-# Revision 1.56 2003/05/23 10:41:26 adam
-# WIN32 updates
-#
-# Revision 1.55 2003/02/18 21:27:53 adam
-# CQL w/bison on WIN32
-#
-# Revision 1.54 2003/02/18 09:11:50 adam
-# Prepare for external utilties: iconv, libxml2 on WIN32
-#
-# Revision 1.53 2003/02/17 22:34:39 adam
-# WIN32 updates
-#
-# Revision 1.52 2002/12/16 14:06:34 adam
-# WIN32 updates for marc8.c
-#
-# Revision 1.51 2002/12/05 12:16:39 adam
-# yaz_strerror. WIN32 updates for mterm2.asn
-#
-# Revision 1.50 2002/10/24 12:14:01 heikki
-# Using a default path to find tcl
-#
-# Revision 1.49 2002/10/22 13:49:53 adam
-# data1 gone
-#
-# Revision 1.48 2002/10/22 10:32:46 adam
-# New source grs1disp.c
-#
-# Revision 1.47 2002/09/06 20:04:49 adam
-# debug=0
-#
-# Revision 1.46 2002/08/30 11:28:01 adam
-# Remove EXPAT reader
-#
-# Revision 1.45 2002/08/27 22:33:30 adam
-# siconv added
-#
-# Revision 1.44 2002/07/25 14:19:18 adam
-# EXPAT support on WIN32
-#
-# Revision 1.43 2002/07/25 13:45:30 adam
-# iconv.dll
-#
-# Revision 1.42 2002/06/05 21:11:00 adam
-# NSIS bz2
-#
-# Revision 1.41 2002/06/04 08:29:53 adam
-# ignore errors on del.
-#
-# Revision 1.40 2002/06/02 21:34:45 adam
-# Remove --enable-module option
-#
-# Revision 1.39 2002/05/31 08:48:06 adam
-# Changed SectionIns for NSIS v1.98
-#
-# Revision 1.38 2002/05/18 09:52:37 oleg
-# Added support of CharacterSetandLanguageNegotiation-3
-# modele (based on Z_PrivateCharacterSet_externallySpecified) at the client
-# side.
-#
-# Revision 1.37 2002/05/17 12:48:30 adam
-# Use __stdcall convention for ZOOM on WIN32
-#
-# Revision 1.36 2002/03/18 21:33:48 adam
-# MARC records embedded in C code for test server
-#
-# Revision 1.35 2002/03/16 10:26:57 adam
-# Added NSIS rules (nmake nsis).
-#
-# Revision 1.34 2002/02/12 15:59:12 adam
-# added z-charneg.obj
-#
-# Revision 1.33 2002/02/11 23:25:26 adam
-# Rustam's patch
-#
-# Revision 1.32 2002/01/30 22:02:03 adam
-# WIN32 updates for YAZ client.
-#
-# Revision 1.31 2001/12/30 22:21:11 adam
-# Scan for ZOOM.
-#
-# Revision 1.30 2001/10/28 23:28:26 adam
-# Enable CCL-to-RPN for YAZ client on WIN32.
-#
-# Revision 1.29 2001/10/25 12:46:07 adam
-# codecs not built as they should.
-#
-# Revision 1.28 2001/10/25 10:45:08 adam
-# Fixed make clean.
-#
-# Revision 1.27 2001/10/24 12:24:43 adam
-# WIN32 updates: ZOOM runs, nmem_init/nmem_exit called in DllMain.
-#
-# Revision 1.26 2001/09/27 12:09:18 adam
-# Function nmem_exit calls oid_exit (when reference is 0).
-#
-# Revision 1.25 2001/09/24 21:51:56 adam
-# New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
-# and yaz_z3950oid_to_str.
-#
-# Revision 1.24 2001/08/14 12:05:58 adam
-# Added sortspec.
-#
-# Revision 1.23 2001/05/18 11:42:03 adam
-# YAZ Build date for WIN32.
-#
-# Revision 1.22 2001/03/09 14:58:20 adam
-# Updated version resource.
-#
-# Revision 1.21 2001/02/28 16:56:33 adam
-# Added version info for WIN32.
-#
-# Revision 1.20 2000/12/01 17:56:41 adam
-# on WIN32 function statserv_closedown closes socket(s) to provoke close.
-#
-# Revision 1.19 2000/11/16 13:03:13 adam
-# Function ccl_rpn_query sets attributeSet to Bib-1.
-#
-# Revision 1.18 2000/11/01 14:47:00 adam
-# Added CCL support for WIN32.
-#
-# Revision 1.17 2000/10/06 12:01:12 adam
-# Updates regarding ASN-code generation (mostly).
-#
-# Revision 1.16 2000/05/05 13:48:15 adam
-# Minor changes.
-#
-# Revision 1.15 2000/04/17 14:21:38 adam
-# WIN32 update.
-#
-# Revision 1.14 2000/03/02 08:48:21 adam
-# Renamed ASN.1 compiler to yaz-comp (used to be yc.tcl).
-#
-# Revision 1.13 2000/02/28 11:13:03 adam
-# Removed odr_priv.obj.
-#
-# Revision 1.12 2000/01/06 11:27:16 adam
-# Updated for ILL.
-#
-# Revision 1.11 1999/12/21 14:16:20 ian
-# Changed retrieval module to allow data1 trees with no associated absyn.
-# Also added a simple interface for extracting values from data1 trees using
-# a string based tagpath.
-#
-# Revision 1.10 1999/12/08 13:10:48 adam
-# New version.
-#
-# Revision 1.9 1999/11/30 13:47:12 adam
-# Improved installation. Moved header files to include/yaz.
-#
-# Revision 1.8 1999/07/21 08:48:02 adam
-# Removed dmalloc.obj.
-#
-# Revision 1.7 1999/06/09 15:10:08 heikki
-# Cleaning up. Seems to work all right
-#
-# Revision 1.6 1999/06/09 13:33:32 heikki
-# Compiles and links both old and new type stuff all right
-#
-# Revision 1.5 1999/06/09 11:05:30 heikki
-# At least it can compile
-#
-# Revision 1.4 1999/06/09 09:41:09 heikki
-# More work on the ASN-generated files.
-#
-# Revision 1.3 1999/06/08 14:32:30 heikki
-# Proto.h works all right, removed linker warnings from server.lib
-#
-# Revision 1.2 1999/06/08 14:07:24 heikki
-# Renamed a pile of files
-# Tmpdir (to get around Ms leaving temp files around, and crashing
-# when too many with same number...)
-#
-# Revision 1.1 1999/06/08 12:15:41 heikki
-# Renamed to makefile (.nothing) (from .mak)
-# Working on the proto.h problems and alternative confiigurations
-#
-# Revision 1.5 1999/06/04 10:04:28 heikki
-# Cleaning up
-#
-# Revision 1.4 1999/06/02 13:23:29 heikki
-# Debug options for C compiler
-#
-# Revision 1.3 1999/05/19 08:26:22 heikki
-# Added comments
-#
-#
-
-
-