-# Copyright (C) 1994-2006, Index Data ApS
+# Copyright (C) 1995-2007, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.106 2006-05-03 13:31:53 adam Exp $
+# $Id: makefile,v 1.130 2007-03-21 19:47:28 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
-###########################################################
-############### Parameters
-###########################################################
+# Parameters
DEBUG=0 # 0 for release, 1 for debug
# iconv charcter conversion utility
HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR = c:\iconv-1.9.2.win32
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.17.win32
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=c:\libxml2-2.6.26.win32
# zlib compression (used by libxml2)
ZLIB_DIR = c:\zlib-1.2.3.win32
dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=1
nmake DEBUG=0
$(NSIS) yaz.nsi
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
TMPDIR=$(ROOTDIR)\win\tmp
TMP=$(TMPDIR)
-###########################################################
-############### Targets - what to make
-###########################################################
+# Targets - what to make
!if $(DEBUG)
DLL=$(BINDIR)\yazd.dll
-IMPLIB=$(LIBDIR)\yazd.lib
+YAZ_IMPLIB=$(LIBDIR)\yazd.lib
!else
DLL=$(BINDIR)\yaz.dll
-IMPLIB=$(LIBDIR)\yaz.lib
+YAZ_IMPLIB=$(LIBDIR)\yaz.lib
!endif
CLIENT=$(BINDIR)\yaz-client.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)\tstlog.exe
+TST_TIMING=$(BINDIR)\tst_timing.exe
# shortcut names defined here
dll: dirs generate $(DLL)
ztest: dirs generate $(ZTEST)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
+ $(ZOOMTST10)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
-testprog: $(TSTLOG)
+testprog: $(TSTLOG) $(TST_TIMING)
htmlhelp: $(DOCDIR)\htmlhelp.chm
-###########################################################
-############### Compiler and linker options
-###########################################################
+# Modules and conditional flags, etc
!if $(HAVE_ICONV)
ICONV_DEF= \
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
!else
LIBXML2_LIB=
-LIBXML2_DEF=/D HAVE_XML2=0
+LIBXML2_DEF=/D YAZ_HAVE_XML2=0
libxml2:
!endif
!if $(HAVE_LIBXSLT)
LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
-LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
+LIBXSLT_DEF= \
+ /D HAVE_XSLTSAVERESULTTOSTRING=1 \
+ /D YAZ_HAVE_XSLT=1 \
+ /I"$(LIBXSLT_DIR)\include"
libxslt: $(BINDIR)\libxslt.dll
$(BINDIR)\libxslt.dll:
!else
LIBXSLT_LIB=
-LIBXSLT_DEF=/D HAVE_XSLT=0
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
libxslt:
!endif
$(LIBXML2_DEF) \
$(LIBXSLT_DEF) \
/D "_CRT_SECURE_NO_DEPRECATE" \
+ /D "_CRT_NONSTDC_NO_DEPRECATE" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
advapi32.lib uuid.lib wsock32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
-COMMON_LNK_OPTIONS= /nologo \
- /subsystem:windows \
- /machine:i386 \
- /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
DEBUG_LNK_OPTIONS= /debug
DLL_LINK_OPTIONS= /dll
CLIENT_LINK_OPTIONS = /subsystem:console
-SERVER_LINK_OPTIONS = -lib
-ZTEST_LINK_OPTIONS = /subsystem:console
COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
TCLOPT= $(COMMON_TCL_OPTIONS)
!endif
+LINK_PROGRAM = $(LINK) $(LNKOPT) \
+ $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZ_IMPLIB)
-###########################################################
-############### Source and object modules
-###########################################################
+LINK_DLL = $(LINK) $(LNKOPT) \
+ $(LINK_LIBS) $(DLL_LINK_OPTIONS)
+
+# Source and object modules
# Note: Ordinary source files are not specified here at
# all, make finds them in suitable dirs. The object modules
YAZ_CLIENT_OBJS= \
$(OBJDIR)\client.obj \
$(OBJDIR)\tabcomplete.obj \
- $(OBJDIR)\admin.obj
+ $(OBJDIR)\admin.obj \
+ $(OBJDIR)\fhistory.obj
+
+ZTEST_OBJS= \
+ $(OBJDIR)\read-marc.obj \
+ $(OBJDIR)\read-grs.obj \
+ $(OBJDIR)\ztest.obj
YAZ_ZOOMSH_OBJS = \
$(OBJDIR)\zoomsh.obj
$(OBJDIR)\zoomtst8.obj
YAZ_ZOOMTST9_OBJS = \
$(OBJDIR)\zoomtst9.obj
+YAZ_ZOOMTST10_OBJS = \
+ $(OBJDIR)\zoomtst10.obj
YAZ_CQL2PQF_OBJS = \
$(OBJDIR)\cql2pqf.obj
TSTLOG_OBJS = \
$(OBJDIR)\tstlog.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"
+TST_TIMING_OBJS = \
+ $(OBJDIR)\tst_timing.obj
-YAZ_CCL_OBJS= \
+MISC_OBJS= \
+ $(OBJDIR)\version.obj \
+ $(OBJDIR)\eventl.obj \
+ $(OBJDIR)\requestq.obj \
+ $(OBJDIR)\service.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)\comstack.obj \
$(OBJDIR)\tcpip.obj \
- $(OBJDIR)\waislen.obj
-
-YAZ_ODR_OBJS= \
+ $(OBJDIR)\waislen.obj \
$(OBJDIR)\ber_any.obj \
$(OBJDIR)\ber_bit.obj \
$(OBJDIR)\ber_bool.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_xml.obj \
+ $(OBJDIR)\marc_read_iso2709.obj \
+ $(OBJDIR)\marc_read_line.obj \
$(OBJDIR)\nmem.obj \
$(OBJDIR)\nmemsdup.obj \
$(OBJDIR)\oid.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
+ $(OBJDIR)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
$(OBJDIR)\record_conv.obj \
- $(OBJDIR)\test.obj
-
-YAZ_ZUTIL_OBJS= \
+ $(OBJDIR)\retrieval.obj \
+ $(OBJDIR)\libxml2_error.obj \
+ $(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
+ $(OBJDIR)\diagsru_update.obj \
$(OBJDIR)\diagsrw.obj \
$(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-opt.obj \
+ $(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
$(OBJDIR)\xmlquery.obj \
- $(OBJDIR)\mime.obj
+ $(OBJDIR)\mime.obj \
+ $(OBJDIR)\cql.obj \
+ $(OBJDIR)\cqlstdio.obj \
+ $(OBJDIR)\cqlstring.obj \
+ $(OBJDIR)\cqltransform.obj \
+ $(OBJDIR)\cqlutil.obj \
+ $(OBJDIR)\cqlstrer.obj \
+ $(OBJDIR)\xcqlutil.obj \
+ $(OBJDIR)\elementset.obj \
+ $(OBJDIR)\timing.obj \
+ $(OBJDIR)\query-charset.obj \
+ $(OBJDIR)\http.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.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
-
-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)
-
-###########################################################
-############### Generated C and H files
-#####
-######################################################
+# Generated C and H files
Z3950_C_DIR=$(SRCDIR)
ILL_C_DIR=$(SRCDIR)
$(ESADMIN_C_FILES) \
$(CHARNEG_C_FILES) \
$(MTERM2_C_FILES) \
- $(OCLCUI_C_FILES)
+ $(OCLCUI_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) \
+ $(ILL_CORE_H_FILES) \
+ $(ITEM_REQ_H_FILES)
generated_files: \
$(GENERATED_H_FILES) \
$(GENERATED_C_FILES) \
+ $(SRCDIR)\diagsrw.c \
+ $(SRCDIR)\diagbib1.c \
+ $(SRCDIR)\diagsru_update.c
-###########################################################
-############### Compiling
-###########################################################
+# Compiling
# Note: This defines where to look for the necessary
# source files. Funny way of doing it, but it works.
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
-############### ASN-generated files
+# ASN-generated files
!if $(HAVE_TCL)
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
- $(TCL) csvtobib1.tcl
+ $(TCL) csvtobib1.tcl $(SRCDIR)
$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
@cd $(SRCDIR)
- $(TCL) csvtosrw.tcl
+ $(TCL) csvtosrw.tcl $(SRCDIR)
+
+$(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtosru_update.tcl $(SRCDIR)
!endif
!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"
$(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:"$(IMPLIB)"
- /map:"$(LIBDIR)\yaz.map"
-<<
-
-$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS)
- @echo Linking $(CLIENT)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_CLIENT_OBJS)
- /map:"$(LIBDIR)\yaz-client.map"
- /out:$(CLIENT)
-<<
-
-$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS)
- @echo Linking $(ZOOMSH)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMSH_OBJS)
- /map:"$(LIBDIR)\zoomsh.map"
- /out:$(ZOOMSH)
-<<
-
-$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS)
- @echo Linking $(ZOOMTST1)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST1_OBJS)
- /map:"$(LIBDIR)\zoomtst1.map"
- /out:$(ZOOMTST1)
-<<
-
-$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS)
- @echo Linking $(ZOOMTST2)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST2_OBJS)
- /map:"$(LIBDIR)\zoomtst2.map"
- /out:$(ZOOMTST2)
-<<
-
-$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS)
- @echo Linking $(ZOOMTST3)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST3_OBJS)
- /map:"$(LIBDIR)\zoomtst3.map"
- /out:$(ZOOMTST3)
-<<
-
-$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS)
- @echo Linking $(ZOOMTST4)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST4_OBJS)
- /map:"$(LIBDIR)\zoomtst4.map"
- /out:$(ZOOMTST4)
-<<
-
-$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS)
- @echo Linking $(ZOOMTST5)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST5_OBJS)
- /map:"$(LIBDIR)\zoomtst5.map"
- /out:$(ZOOMTST5)
-<<
-
-$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS)
- @echo Linking $(ZOOMTST6)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST6_OBJS)
- /map:"$(LIBDIR)\zoomtst6.map"
- /out:$(ZOOMTST6)
-<<
-
-$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS)
- @echo Linking $(ZOOMTST7)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST7_OBJS)
- /map:"$(LIBDIR)\zoomtst7.map"
- /out:$(ZOOMTST7)
-<<
-
-$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
- @echo Linking $(ZOOMTST8)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST8_OBJS)
- /map:"$(LIBDIR)\zoomtst8.map"
- /out:$(ZOOMTST8)
-<<
-
-
-$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS)
- @echo Linking $(ZOOMTST9)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_ZOOMTST9_OBJS)
- /map:"$(LIBDIR)\zoomtst9.map"
- /out:$(ZOOMTST9)
-<<
-
-$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS)
- @echo Linking $(CQL2PQF)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_CQL2PQF_OBJS)
- /map:"$(LIBDIR)\cql2pqf.map"
- /out:$(CQL2PQF)
-<<
-
-$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS)
- @echo Linking $(CQL2XCQL)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(YAZ_CQL2XCQL_OBJS)
- /map:"$(LIBDIR)\cql2xcql.map"
- /out:$(CQL2XCQL)
-<<
+# Linking
+
+$(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
+ $(LINK_DLL) \
+ $(DLL_OBJS) \
+ $(YAZ_RES) \
+ /out:$(DLL) \
+ /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)
- @echo Linking $(ZTEST)
- $(LINK) @<<
- $(LNKOPT)
- $(ZTEST_LINK_OPTIONS)
- $(LINK_LIBS)
- shell32.lib
- $(IMPLIB)
- $(ZTEST_OBJS)
- /implib:"$(LIBDIR)\yaz-ztest.lib"
- /map:"$(LIBDIR)\yaz-ztest.map"
- /out:$(ZTEST)
-<<
+ $(LINK_PROGRAM) $(ZTEST_OBJS) /out:$(ZTEST)
$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
- @echo Linking $(YAZ_MARCDUMP)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- shell32.lib
- $(IMPLIB)
- $(YAZ_MARCDUMP_OBJS)
- /map:"$(LIBDIR)\yaz-marcdump.map"
- /out:$(YAZ_MARCDUMP)
-<<
-
-
-$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS)
- @echo Linking $(TSTLOG)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(IMPLIB)
- $(TSTLOG_OBJS)
- /map:"$(LIBDIR)\tstlog.map"
- /out:$(TSTLOG)
-<<
+ $(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)
+
+# Other rules
$(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp
@cd $(DOCDIR)
-$(HHC) htmlhelp.hhp
@cd $(WINDIR)
-# note that this links a lib, so it uses completely different options.
-
-###########################################################
-############### Special operations
-###########################################################
-
-
-############## clean
clean:
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
-del $(TMPDIR)\*.
- -del $(LIBDIR)\*.MAP
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
# 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):
if not exist "$@/$(NUL)" mkdir "$@"
-###########################################################
-############### Explicit dependencies
-###########################################################
+# Explicit dependencies
# force recompilation of everything, if makefile changed
projects / yaz-moved-to-github.git / blobdiff