-# Copyright (C) 1994-2006, Index Data ApS
+# Copyright (C) 1995-2007, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.113 2006-07-06 10:17:56 adam Exp $
+# $Id: makefile,v 1.130 2007-03-21 19:47:28 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
# 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
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
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)\retrieval.obj \
$(OBJDIR)\libxml2_error.obj \
- $(OBJDIR)\test.obj
-
-YAZ_ZUTIL_OBJS= \
+ $(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
$(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
@cd $(SRCDIR)
$(TCL) csvtosrw.tcl $(SRCDIR)
+$(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtosru_update.tcl $(SRCDIR)
+
!endif
!if $(HAVE_BISON)
$(DLL_OBJS) \
$(YAZ_RES) \
/out:$(DLL) \
- /implib:"$(YAZ_IMPLIB)" \
- /map:"$(LIBDIR)\yaz.map"
+ /implib:"$(YAZ_IMPLIB)"
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_CLIENT_OBJS) \
- /map:"$(LIBDIR)\yaz-client.map" \
- /out:$(CLIENT)
+ $(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$(CLIENT)
$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMSH_OBJS) \
- /map:"$(LIBDIR)\zoomsh.map" \
- /out:$(ZOOMSH)
+ $(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$(ZOOMSH)
$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST1_OBJS) \
- /map:"$(LIBDIR)\zoomtst1.map" \
- /out:$(ZOOMTST1)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$(ZOOMTST1)
$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST2_OBJS) \
- /map:"$(LIBDIR)\zoomtst2.map" \
- /out:$(ZOOMTST2)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$(ZOOMTST2)
$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST3_OBJS) \
- /map:"$(LIBDIR)\zoomtst3.map" \
- /out:$(ZOOMTST3)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$(ZOOMTST3)
$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST4_OBJS) \
- /map:"$(LIBDIR)\zoomtst4.map" \
- /out:$(ZOOMTST4)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$(ZOOMTST4)
$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST5_OBJS) \
- /map:"$(LIBDIR)\zoomtst5.map" \
- /out:$(ZOOMTST5)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$(ZOOMTST5)
$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST6_OBJS) \
- /map:"$(LIBDIR)\zoomtst6.map" \
- /out:$(ZOOMTST6)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$(ZOOMTST6)
$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST7_OBJS) \
- /map:"$(LIBDIR)\zoomtst7.map" \
- /out:$(ZOOMTST7)
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$(ZOOMTST7)
$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST8_OBJS) \
- /map:"$(LIBDIR)\zoomtst8.map" \
- /out:$(ZOOMTST8)
-
+ $(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$(ZOOMTST8)
$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_ZOOMTST9_OBJS) \
- /map:"$(LIBDIR)\zoomtst9.map" \
- /out:$(ZOOMTST9)
+ $(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) \
- /map:"$(LIBDIR)\cql2pqf.map" \
- /out:$(CQL2PQF)
+ $(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$(CQL2PQF)
$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(YAZ_CQL2XCQL_OBJS) \
- /map:"$(LIBDIR)\cql2xcql.map" \
- /out:$(CQL2XCQL)
+ $(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$(CQL2XCQL)
$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(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)
- $(LINK_PROGRAM) \
- $(YAZ_MARCDUMP_OBJS) \
- /map:"$(LIBDIR)\yaz-marcdump.map" \
- /out:$(YAZ_MARCDUMP)
-
+ $(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$(YAZ_MARCDUMP)
$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
- $(LINK_PROGRAM) \
- $(TSTLOG_OBJS) \
- /map:"$(LIBDIR)\tstlog.map" \
- /out:$(TSTLOG)
+ $(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$(TSTLOG)
+
+$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(DLL)
+ $(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$(TST_TIMING)
# Other rules
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
-del $(TMPDIR)\*.
- -del $(LIBDIR)\*.MAP
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
projects / yaz-moved-to-github.git / blobdiff