-# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.43 2002-07-25 13:45:30 adam Exp $
+# Copyright (C) 1994-2006, Index Data ApS
+# All rights reserved.
+# $Id: makefile,v 1.109 2006-05-26 15:46:44 adam Exp $
#
# Programmed by
-# HL: Heikki Levanto, Index Data
-#
-# Log at the end of the file
-#
-# Missing
-# - Move MS-C's whatnots into win direcotry
-# - The TCL script produces C and H files in the same dir as the
-# ASN files. H's are copied to INCL, C's are left there.
-# They should be produced into OBJ...
-#
-# Envoronment problems
-# - You need to have the proper path and environment for VC set
-# up. There is a bat file VCVARS32.BAT that sets most of it up
-# for you. You can find this somewhere near DevStudio\VC\BIN
-# - RegSvr32 must also be along the path, often in WINDOWS\SYSTEM
-# - TCL has to be available too, if compiling for NEW_Z3950
+# Heikki Levanto & Adam Dickmeiss
###########################################################
############### Parameters
###########################################################
-DEBUG=1 # 0 for release, 1 for debug
-
-# iconv
-HAVE_ICONV=1
-ICONV_DIR = c:\libiconv-1.7.0.1
+DEBUG=0 # 0 for release, 1 for debug
# TCL
-TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\Tcl\bin\tclsh84.exe"
+#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
HAVE_TCL=1
+# iconv charcter conversion utility
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.9.1.win32
+
+# libxslt
+HAVE_LIBXSLT=1
+LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+
+# libxml2
+HAVE_LIBXML2=1
+LIBXML2_DIR=c:\libxml2-2.6.20.win32
+
+# zlib compression (used by libxml2)
+ZLIB_DIR = c:\zlib-1.2.3.win32
+
+# get WIN32 binaries libxml2 & iconv & zlib from here:
+# http://www.zlatkovic.com/libxml.en.html
+
+# bison
+HAVE_BISON=1
+BISON=bison
+
default: all
-all: dirs generate dll client ztest zoomsh
+all: dirs generate dll client ztest zoomsh utilprog testprog iconv libxml2 libxslt
-NSIS="c:\program files\nsis\makensis-bz2.exe"
+NSIS="c:\program files\nsis\makensis.exe"
+HHC="c:\program files\html help workshop\hhc.exe"
-nsis: all
+dist:
+ nmake DEBUG=1 clean
+ nmake DEBUG=0 clean
+ nmake DEBUG=1
+ nmake DEBUG=0
+ $(NSIS) yaz.nsi
+
+nsis:
$(NSIS) yaz.nsi
nsishelp:
generate: generated_files
+
+
###########################################################
############### 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
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
-
-CLIENTDIR=$(SRCDIR)\CLIENT
-SERVERDIR=$(SRCDIR)\SERVER
-ZTESTDIR=$(SRCDIR)\ZTEST
+SRCDIR=$(ROOTDIR)\src # for the case we move them under src
+DOCDIR=$(ROOTDIR)\doc # where the doc is
+
+# where we store intermediate files
+!if $(DEBUG)
+OBJDIR=$(WINDIR)\dobj
+!else
+OBJDIR=$(WINDIR)\obj
+!endif
+
+CLIENTDIR=$(ROOTDIR)\CLIENT
+ZTESTDIR=$(ROOTDIR)\ZTEST
+ZOOMDIR=$(ROOTDIR)\ZOOM
+UTILDIR=$(ROOTDIR)\UTIL
+TESTDIR=$(ROOTDIR)\TEST
TMPDIR=$(ROOTDIR)\win\tmp
TMP=$(TMPDIR)
############### Targets - what to make
###########################################################
-
-DLL=$(BINDIR)\Yaz.dll
-IMPLIB=$(LIBDIR)\Yaz.lib
+!if $(DEBUG)
+DLL=$(BINDIR)\yazd.dll
+IMPLIB=$(LIBDIR)\yazd.lib
+!else
+DLL=$(BINDIR)\yaz.dll
+IMPLIB=$(LIBDIR)\yaz.lib
+!endif
CLIENT=$(BINDIR)\yaz-client.exe
ZOOMSH=$(BINDIR)\zoomsh.exe
ZOOMTST6=$(BINDIR)\zoomtst6.exe
ZOOMTST7=$(BINDIR)\zoomtst7.exe
ZOOMTST8=$(BINDIR)\zoomtst8.exe
+ZOOMTST9=$(BINDIR)\zoomtst9.exe
+
+CQL2PQF=$(BINDIR)\cql2pqf.exe
+CQL2XCQL=$(BINDIR)\cql2xcql.exe
+YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
+
+TSTLOG=$(BINDIR)\tstlog.exe
# shortcut names defined here
-dll : $(DLL)
-client: $(CLIENT)
-ztest: $(ZTEST)
+dll: dirs generate $(DLL)
+client: dirs generate $(CLIENT)
+ztest: dirs generate $(ZTEST)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9)
+
+utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
+
+testprog: $(TSTLOG)
+
+htmlhelp: $(DOCDIR)\htmlhelp.chm
###########################################################
############### Compiler and linker options
/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)\bin\iconv.dll" $(BINDIR)
!else
ICONV_DEF= \
/D HAVE_ICONV_H=0
ICONV_LIB=
+iconv:
+
+!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 $(BINDIR)\zlib1.dll
+
+$(BINDIR)\libxml2.dll:
+ 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:
+
!endif
-
+
+!if $(HAVE_LIBXSLT)
+LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
+LIBXSLT_DEF= \
+ /D HAVE_XSLTSAVERESULTTOSTRING=1 \
+ /D 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 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) \
+ $(LIBXML2_DEF) \
+ $(LIBXSLT_DEF) \
+ /D "_CRT_SECURE_NO_DEPRECATE" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
- /I"$(SRCDIR)\include"
+ /I"$(ROOTDIR)\include"
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
- /MDd /Od /YX /Zi /Gm
+ /MDd /Od /Zi /Gm
RELEASE_C_OPTIONS= \
/D "NDEBUG" \
# /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
LINK=link.exe
LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
- advapi32.lib uuid.lib \
- wsock32.lib advapi32.lib $(ICONV_LIB)
+ advapi32.lib uuid.lib wsock32.lib advapi32.lib \
+ $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
COMMON_LNK_OPTIONS= /nologo \
/subsystem:windows \
DEBUG_LNK_OPTIONS= /debug
-RELEASE_LNK_OPTIONS= /pdb:none
+RELEASE_LNK_OPTIONS=
DLL_LINK_OPTIONS= /dll
CLIENT_LINK_OPTIONS = /subsystem:console
-ZOOMSH_LINK_OPTIONS = /subsystem:console
SERVER_LINK_OPTIONS = -lib
ZTEST_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)
!endif
-
###########################################################
############### Source and object modules
###########################################################
$(OBJDIR)\zoomtst7.obj
YAZ_ZOOMTST8_OBJS = \
$(OBJDIR)\zoomtst8.obj
+YAZ_ZOOMTST9_OBJS = \
+ $(OBJDIR)\zoomtst9.obj
+
+YAZ_CQL2PQF_OBJS = \
+ $(OBJDIR)\cql2pqf.obj
+YAZ_CQL2XCQL_OBJS = \
+ $(OBJDIR)\cql2xcql.obj
+YAZ_MARCDUMP_OBJS = \
+ $(OBJDIR)\marcdump.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"
+ "$(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"
+ "$(OBJDIR)\read-marc.obj" \
+ "$(OBJDIR)\read-grs.obj" \
+ "$(OBJDIR)\ztest.obj"
YAZ_CCL_OBJS= \
$(OBJDIR)\cclerrms.obj \
$(OBJDIR)\odr_util.obj
YAZ_UTIL_OBJS= \
+ $(OBJDIR)\version.obj \
$(OBJDIR)\atoin.obj \
$(OBJDIR)\log.obj \
$(OBJDIR)\marcdisp.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\xmalloc.obj \
- $(OBJDIR)\matchstr.obj
+ $(OBJDIR)\matchstr.obj \
+ $(OBJDIR)\siconv.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)\diagbib1.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
-
-
-YAZ_RET_OBJS= \
- $(OBJDIR)\d1_absyn.obj\
- $(OBJDIR)\d1_attset.obj\
- $(OBJDIR)\d1_doespec.obj\
- $(OBJDIR)\d1_espec.obj\
- $(OBJDIR)\d1_expout.obj\
- $(OBJDIR)\d1_grs.obj\
- $(OBJDIR)\d1_handle.obj\
- $(OBJDIR)\d1_map.obj\
- $(OBJDIR)\d1_marc.obj\
- $(OBJDIR)\d1_prtree.obj\
- $(OBJDIR)\d1_read.obj\
- $(OBJDIR)\d1_soif.obj\
- $(OBJDIR)\d1_sumout.obj\
- $(OBJDIR)\d1_sutrs.obj\
- $(OBJDIR)\d1_tagset.obj\
- $(OBJDIR)\d1_varset.obj\
- $(OBJDIR)\d1_write.obj\
- $(OBJDIR)\d1_if.obj
+ $(OBJDIR)\charneg.obj \
+ $(OBJDIR)\grs1disp.obj \
+ $(OBJDIR)\opacdisp.obj \
+ $(OBJDIR)\zgdu.obj \
+ $(OBJDIR)\soap.obj \
+ $(OBJDIR)\srw.obj \
+ $(OBJDIR)\srwutil.obj \
+ $(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-opt.obj \
+ $(OBJDIR)\initopt.obj \
+ $(OBJDIR)\xmlquery.obj \
+ $(OBJDIR)\mime.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
$(OBJDIR)\zes-pset.obj \
$(OBJDIR)\zes-update0.obj \
$(OBJDIR)\prt-ext.obj \
- $(OBJDIR)\z-charneg.obj
+ $(OBJDIR)\z-charneg.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_RET_OBJS) \
- $(YAZ_SERVER_OBJS) \
- $(YAZ_ZOOM_OBJS)
-
-YAZ_OBJS= \
- $(Z3950_OBJS) \
- $(ILL_OBJS) \
- $(COMMON_YAZ_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)
+Z3950_C_DIR=$(SRCDIR)
+ILL_C_DIR=$(SRCDIR)
#!!! Should be moved to OBJ, but that requires too much trickery
# Files generated from datetime.asn
CHARNEG_H_FILES = $(INCLDIR)\yaz\z-charneg.h
CHARNEG_C_FILES = $(Z3950_C_DIR)\z-charneg.c
+# Files generated from mterm2.asn
+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 \
ILL_CORE_FILES= $(ILL_CORE_C_FILES) $(ILL_CORE_H_FILES)
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) \
$(UNIVRES_C_FILES) \
$(DATETIME_C_FILES) \
$(ESADMIN_C_FILES) \
- $(CHARNEG_C_FILES)
+ $(CHARNEG_C_FILES) \
+ $(MTERM2_C_FILES) \
+ $(OCLCUI_C_FILES)
GENERATED_H_FILES= \
$(Z3950V3_H_FILES) \
$(UNIVRES_H_FILES) \
$(DATETIME_H_FILES) \
$(ESADMIN_H_FILES) \
- $(CHARNEG_H_FILES)
+ $(CHARNEG_H_FILES) \
+ $(MTERM2_H_FILES) \
+ $(OCLCUI_H_FILES)
generated_files: \
$(GENERATED_H_FILES) \
# 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
+# 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) $<
# Various YAZ source directories
-{$(ASNDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
-
-{$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:
+{$(SRCDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
-{$(ODRDIR)}.c{$(OBJDIR)}.obj:
+{$(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) $<
-
-{$(CCLDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
-
-{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
+{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
############### 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)
-$(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
- @cd $(ILLDIR)
+$(MTERM2_FILES): $(SRCDIR)\mterm2.asn
+ @cd $(SRCDIR)
+ $(TCL) $(TCLOPT) -d z.tcl mterm2.asn
+ @cd $(WINDIR)
+
+$(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
+ @cd $(SRCDIR)
+ $(TCL) $(TCLOPT) -d z.tcl oclcui.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)
+$(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)\diagbib1.c: $(SRCDIR)\bib1.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtobib1.tcl $(SRCDIR)
+
+$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtosrw.tcl $(SRCDIR)
+
!endif
+!if $(HAVE_BISON)
+$(SRCDIR)\cql.c: $(SRCDIR)\cql.y
+ @cd $(SRCDIR)
+ $(BISON) -y -p cql_ -o cql.c cql.y
+
+!endif
###########################################################
############### Resources
$(DLL_OBJS)
$(YAZ_RES)
/out:$(DLL)
- /implib:"$(LIBDIR)\yaz.lib"
- /pdb:"$(LIBDIR)\yaz.pdb"
+ /implib:"$(IMPLIB)"
/map:"$(LIBDIR)\yaz.map"
<<
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_CLIENT_OBJS)
- /pdb:"$(LIBDIR)\yaz-client.pdb"
/map:"$(LIBDIR)\yaz-client.map"
/out:$(CLIENT)
<<
@echo Linking $(ZOOMSH)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMSH_OBJS)
- /pdb:"$(LIBDIR)\zoomsh.pdb"
/map:"$(LIBDIR)\zoomsh.map"
/out:$(ZOOMSH)
<<
@echo Linking $(ZOOMTST1)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST1_OBJS)
- /pdb:"$(LIBDIR)\zoomtst1.pdb"
/map:"$(LIBDIR)\zoomtst1.map"
/out:$(ZOOMTST1)
<<
@echo Linking $(ZOOMTST2)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST2_OBJS)
- /pdb:"$(LIBDIR)\zoomtst2.pdb"
/map:"$(LIBDIR)\zoomtst2.map"
/out:$(ZOOMTST2)
<<
@echo Linking $(ZOOMTST3)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST3_OBJS)
- /pdb:"$(LIBDIR)\zoomtst3.pdb"
/map:"$(LIBDIR)\zoomtst3.map"
/out:$(ZOOMTST3)
<<
@echo Linking $(ZOOMTST4)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST4_OBJS)
- /pdb:"$(LIBDIR)\zoomtst4.pdb"
/map:"$(LIBDIR)\zoomtst4.map"
/out:$(ZOOMTST4)
<<
@echo Linking $(ZOOMTST5)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST5_OBJS)
- /pdb:"$(LIBDIR)\zoomtst5.pdb"
/map:"$(LIBDIR)\zoomtst5.map"
/out:$(ZOOMTST5)
<<
@echo Linking $(ZOOMTST6)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST6_OBJS)
- /pdb:"$(LIBDIR)\zoomtst6.pdb"
/map:"$(LIBDIR)\zoomtst6.map"
/out:$(ZOOMTST6)
<<
@echo Linking $(ZOOMTST7)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST7_OBJS)
- /pdb:"$(LIBDIR)\zoomtst7.pdb"
/map:"$(LIBDIR)\zoomtst7.map"
/out:$(ZOOMTST7)
<<
@echo Linking $(ZOOMTST8)
$(LINK) @<<
$(LNKOPT)
- $(ZOOMSH_LINK_OPTIONS)
+ $(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_ZOOMTST8_OBJS)
- /pdb:"$(LIBDIR)\zoomtst8.pdb"
/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)
+<<
+
$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
- @echo Linking the ztest $(ZTEST)
+ @echo Linking $(ZTEST)
$(LINK) @<<
$(LNKOPT)
$(ZTEST_LINK_OPTIONS)
$(IMPLIB)
$(ZTEST_OBJS)
/implib:"$(LIBDIR)\yaz-ztest.lib"
- /pdb:"$(LIBDIR)\yaz-ztest.pdb"
/map:"$(LIBDIR)\yaz-ztest.map"
/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)
+<<
+
+$(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.
clean:
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
+ -del $(BINDIR)\*.pdb
-del $(TMPDIR)\*.
-
-del $(LIBDIR)\*.MAP
-
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
realclean: clean
- -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)
# new proto.h refers to the generated files, and is included
# in various places
-###########################################################
-############### Log
-###########################################################
-#
-# $Log: makefile,v $
-# 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
-#
-#
-
-
-
projects / yaz-moved-to-github.git / blobdiff