# Copyright (C) 1994-2006, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.113 2006-07-06 10:17:56 adam Exp $
+# $Id: makefile,v 1.117 2006-08-03 09:27:23 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
$(OBJDIR)\tabcomplete.obj \
$(OBJDIR)\admin.obj
+ZTEST_OBJS= \
+ $(OBJDIR)\read-marc.obj \
+ $(OBJDIR)\read-grs.obj \
+ $(OBJDIR)\ztest.obj
+
YAZ_ZOOMSH_OBJS = \
$(OBJDIR)\zoomsh.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"
-
-YAZ_CCL_OBJS= \
+MISC_OBJS= \
+ $(OBJDIR)\version.obj \
+ $(OBJDIR)\nfa.obj \
+ $(OBJDIR)\nfaxml.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)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
$(OBJDIR)\libxml2_error.obj \
- $(OBJDIR)\test.obj
-
-YAZ_ZUTIL_OBJS= \
+ $(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\diagsrw.obj \
$(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zoom-opt.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
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
# Compiling