# Copyright (C) 1994-2003, Index Data
# All rights reserved.
-# $Id: makefile,v 1.56 2003-05-23 10:41:26 adam Exp $
+# $Id: makefile,v 1.65 2003-10-02 06:30:45 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
############### Parameters
###########################################################
-DEBUG=1 # 0 for release, 1 for debug
+DEBUG=0 # 0 for release, 1 for debug
# TCL
TCL="C:\Tcl\bin\tclsh84.exe"
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.5.3.win32
+LIBXML2_DIR=c:\libxml2-2.5.10.win32
# WIN32 binaries libxml2 & iconv from here:
# http://www.zlatkovic.com/projects/libxml/binaries.html
############### Directories
###########################################################
# The current directory is supposed to be something like
-# ..../Yaz/Win, everything is relative to that
-ROOTDIR=.. # The home of Yaz
+# ..../yaz/win, everything is relative to that
+ROOTDIR=.. # The home of yaz
INCLDIR=$(ROOTDIR)\include # our includes
LIBDIR=$(ROOTDIR)\lib # We produce .lib, .exp etc there
############### Targets - what to make
###########################################################
-DLL=$(BINDIR)\Yaz.dll
-IMPLIB=$(LIBDIR)\Yaz.lib
+DLL=$(BINDIR)\yaz.dll
+IMPLIB=$(LIBDIR)\yaz.lib
CLIENT=$(BINDIR)\yaz-client.exe
ZOOMSH=$(BINDIR)\zoomsh.exe
/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)\lib\iconv.dll" $(BINDIR)
!else
ICONV_DEF= \
/D HAVE_ICONV_H=0
!endif
!if $(HAVE_LIBXML2)
-LIBXML2_LIB=$(LIBXML2_DIR)\lib\libxml2.lib
+LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
libxml2: $(BINDIR)\libxml2.dll
$(BINDIR)\libxml2.dll:
- copy $(LIBXML2_DIR)\lib\libxml2.dll $(BINDIR)
+ copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
!else
LIBXML2_LIB=
LIBXML2_DEF=/D HAVE_XML2=0
CQL2XCQL_LINK_OPTIONS = /subsystem:console
-COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
+COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
# Final opt variables
!if $(DEBUG)
$(OBJDIR)\z3950oid.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
+ $(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
- $(OBJDIR)\srw.obj
+ $(OBJDIR)\srw.obj \
+ $(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-opt.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
$(OBJDIR)\zes-update0.obj \
$(OBJDIR)\prt-ext.obj \
$(OBJDIR)\z-charneg.obj \
- $(OBJDIR)\z-mterm2.obj
+ $(OBJDIR)\z-mterm2.obj \
+ $(OBJDIR)\z-oclcui.obj
ILL_OBJS= \
$(OBJDIR)\ill-get.obj\
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
-YAZ_ZOOM_OBJS = \
- $(OBJDIR)\zoom-c.obj \
- $(OBJDIR)\zoom-opt.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
-COMMON_YAZ_OBJS= \
+YAZ_OBJS =\
$(YAZ_UTIL_OBJS) \
$(YAZ_ODR_OBJS) \
$(YAZ_COMSTACK_OBJS) \
+ $(Z3950_OBJS) \
+ $(ILL_OBJS) \
$(YAZ_ZUTIL_OBJS) \
$(YAZ_CCL_OBJS) \
- $(YAZ_SERVER_OBJS) \
- $(YAZ_ZOOM_OBJS) \
- $(YAZ_CQL_OBJS)
-
-YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
- $(Z3950_OBJS) \
- $(ILL_OBJS)
+ $(YAZ_CQL_OBJS) \
+ $(YAZ_SERVER_OBJS)
DLL_OBJS= $(YAZ_OBJS)
MTERM2_H_FILES = $(INCLDIR)\yaz\z-mterm2.h
MTERM2_C_FILES = $(Z3950_C_DIR)\z-mterm2.c
+# Files generated from mterm2.asn
+OCLCUI_H_FILES = $(INCLDIR)\yaz\z-oclcui.h
+OCLCUI_C_FILES = $(Z3950_C_DIR)\z-oclcui.c
+
# Files created from z3950v3.asn
Z3950V3_H_FILES= \
$(INCLDIR)\yaz\z-accdes1.h \
ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
+OCLCUI_FILES = $(OCLCUI_C_FILES) $(OCLCUI_H_FILES)
GENERATED_C_FILES= \
$(Z3950V3_C_FILES) \
$(DATETIME_C_FILES) \
$(ESADMIN_C_FILES) \
$(CHARNEG_C_FILES) \
- $(MTERM2_C_FILES)
+ $(MTERM2_C_FILES) \
+ $(OCLCUI_C_FILES)
GENERATED_H_FILES= \
$(Z3950V3_H_FILES) \
$(DATETIME_H_FILES) \
$(ESADMIN_H_FILES) \
$(CHARNEG_H_FILES) \
- $(MTERM2_H_FILES)
+ $(MTERM2_H_FILES) \
+ $(OCLCUI_H_FILES)
generated_files: \
$(GENERATED_H_FILES) \
{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
@$(CPP) $(COPT) $<
-# Yaz client
+# yaz client
{$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
@$(CPP) $(COPT) $< /D"_CONSOLE"
$(TCL) $(TCLOPT) -d z.tcl mterm2.asn
@cd $(WINDIR)
+$(OCLCUI_FILES): $(Z3950DIR)\oclcui.asn
+ @cd $(Z3950DIR)
+ $(TCL) $(TCLOPT) -d z.tcl oclcui.asn
+ @cd $(WINDIR)
+
$(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
@cd $(ILLDIR)
$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
$(UTILDIR)\marc8.c: $(UTILDIR)\charconv.sgm
@cd $(UTILDIR)
- $(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm marc8.c
+ $(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
!endif
###########################################################
#
# $Log: makefile,v $
-# Revision 1.56 2003-05-23 10:41:26 adam
+# Revision 1.65 2003-10-02 06:30:45 adam
+# Quote ICONV_DIR/LIBXML2_DIR as suggested by Michael Freidgeim
+#
+# 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