X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=1979f19658d1d18372d511c886f7f29a7bfc7225;hp=e7de5bfbc60704da9b8b8b9fa174bcd0d13c1b21;hb=00106dc85fcaa3b02f9a0d471ea90a594bf3a175;hpb=25fa35a0e1f84fa9b6366d71ee5b2ab58a2bd468

diff --git a/win/makefile b/win/makefile
index e7de5bf..1979f19 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,23 +1,10 @@
-# Makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.4 1999-06-09 09:41:09 heikki Exp $
+# Copyright (C) 1994-2004, Index Data
+# All rights reserved.
+# $Id: makefile,v 1.71 2004-03-15 21:39:07 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
 
 ###########################################################
 ############### Parameters 
@@ -25,41 +12,58 @@
 
 DEBUG=0   # 0 for release, 1 for debug
 
-NEW_Z3950=1  # 0= use old asn files
-             # 1= generate files from *.asn (needs tcl)
+# TCL
+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.8.win32
 
+# libxml2
+HAVE_LIBXML2=1
+LIBXML2_DIR=c:\libxml2-2.5.10.win32
+
+# WIN32 binaries libxml2 & iconv from here:
+#  http://www.zlatkovic.com/projects/libxml/binaries.html
+
+# bison
+HAVE_BISON=1
+BISON=bison
 
 default: all
 
-all: dirs proto_h dll client server ztest 
+all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
+
+NSIS="c:\program files\nsis\makensis-bz2.exe"
 
+nsis: all
+	$(NSIS) yaz.nsi
+
+nsishelp:
+	$(NSIS)
+
+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
+SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 
-CLIENTDIR=$(SRCDIR)\CLIENT
-SERVERDIR=$(SRCDIR)\SERVER
-ZTESTDIR=$(SRCDIR)\ZTEST
+CLIENTDIR=$(ROOTDIR)\CLIENT
+ZTESTDIR=$(ROOTDIR)\ZTEST
+ZOOMDIR=$(ROOTDIR)\ZOOM
+UTILDIR=$(ROOTDIR)\UTIL
 
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
@@ -68,26 +72,72 @@ TMP=$(TMPDIR)
 ############### 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
+ZTEST=$(BINDIR)\yaz-ztest.exe
 
-CLIENT=$(BINDIR)\client.exe
-SERVER=$(LIBDIR)\server.lib
-ZTEST=$(BINDIR)\ztest.exe
-PROTOH=$(INCLDIR)\proto.h
+ZOOMTST1=$(BINDIR)\zoomtst1.exe
+ZOOMTST2=$(BINDIR)\zoomtst2.exe
+ZOOMTST3=$(BINDIR)\zoomtst3.exe
+ZOOMTST4=$(BINDIR)\zoomtst4.exe
+ZOOMTST5=$(BINDIR)\zoomtst5.exe
+ZOOMTST6=$(BINDIR)\zoomtst6.exe
+ZOOMTST7=$(BINDIR)\zoomtst7.exe
+ZOOMTST8=$(BINDIR)\zoomtst8.exe
+
+CQL2PQF=$(BINDIR)\cql2pqf.exe
+CQL2XCQL=$(BINDIR)\cql2xcql.exe
+YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
-server: $(SERVER)
 ztest: $(ZTEST)
-proto_h: $(PROTOH)
+
+zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
+
+utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
 
 ###########################################################
 ############### Compiler and linker options 
 ###########################################################
 
+!if $(HAVE_ICONV)
+ICONV_DEF= \
+  /D HAVE_ICONV_H=1 \
+  /I"$(ICONV_DIR)\include"
+ICONV_LIB= \
+  "$(ICONV_DIR)\lib\iconv.lib"
+iconv: $(BINDIR)\iconv.dll
+
+$(BINDIR)\iconv.dll:
+  copy "$(ICONV_DIR)\lib\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)\libxml2.dll:
+  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+!else
+LIBXML2_LIB=
+LIBXML2_DEF=/D HAVE_XML2=0
+libxml2: 
+
+!endif
+
 
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
@@ -95,13 +145,17 @@ proto_h: $(PROTOH)
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
-  /D "WIN32" /D "_WINDOWS" \
+  $(ICONV_DEF)             \
+  $(LIBXML2_DEF)           \
+  /D "_WINDOWS"            \
+  /D "WIN32"               \
+  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
 
 COMMON_C_INCLUDES= \
-  /I"$(SRCDIR)\include"
+  /I"$(ROOTDIR)\include"
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
@@ -127,20 +181,14 @@ RELEASE_C_OPTIONS=  \
 # /Zi  = Program database for debuggers
 # /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
 
-### The RC compiler (resource files)
-RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
-
 
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
-           comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
-           oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib
+LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
+           advapi32.lib uuid.lib \
+           wsock32.lib  advapi32.lib \
+           $(ICONV_LIB) $(LIBXML2_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -149,18 +197,14 @@ COMMON_LNK_OPTIONS= /nologo \
 
 DEBUG_LNK_OPTIONS= /debug 
 
-RELEASE_LNK_OPTIONS=  /pdb:none
+RELEASE_LNK_OPTIONS=
 
 DLL_LINK_OPTIONS= /dll  
 CLIENT_LINK_OPTIONS = /subsystem:console  
 SERVER_LINK_OPTIONS = -lib 
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
-# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh80.exe"
-
-COMMON_TCL_OPTIONS= ..\util\yc.tcl -d z.tcl
-
+COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
 
 # Final opt variables
 !if $(DEBUG)
@@ -179,60 +223,67 @@ TCLOPT= $(COMMON_TCL_OPTIONS)
 !endif
 
 
-
 ###########################################################
 ###############  Source and object modules
 ###########################################################
 
-# The resource files
-
-RCFILE=$(SRCDIR)\compmak.rc
-# Horrible Hack: The resfile contains just one line, pointing
-# to the component.tlb file (which is created by the idl compiler)
-# Devstudio wants that file to live in YazX3950, this makefile in
-# win/obj. So we need to RC files!
-
-RESFILE=$(OBJDIR)\component.res
-
-
-# The def file
-#DEF_FILE= $(ROOTDIR)\component.def 
-
-
-
 # Note: Ordinary source files are not specified here at 
 # all, make finds them in suitable dirs. The object modules
 # need to be specified, though
 
 YAZ_CLIENT_OBJS= \
-   $(OBJDIR)\client.obj
+   $(OBJDIR)\client.obj \
+   $(OBJDIR)\tabcomplete.obj \
+   $(OBJDIR)\admin.obj
+
+YAZ_ZOOMSH_OBJS = \
+   $(OBJDIR)\zoomsh.obj
+
+YAZ_ZOOMTST1_OBJS = \
+   $(OBJDIR)\zoomtst1.obj
+YAZ_ZOOMTST2_OBJS = \
+   $(OBJDIR)\zoomtst2.obj
+YAZ_ZOOMTST3_OBJS = \
+   $(OBJDIR)\zoomtst3.obj
+YAZ_ZOOMTST4_OBJS = \
+   $(OBJDIR)\zoomtst4.obj
+YAZ_ZOOMTST5_OBJS = \
+   $(OBJDIR)\zoomtst5.obj
+YAZ_ZOOMTST6_OBJS = \
+   $(OBJDIR)\zoomtst6.obj
+YAZ_ZOOMTST7_OBJS = \
+   $(OBJDIR)\zoomtst7.obj
+YAZ_ZOOMTST8_OBJS = \
+   $(OBJDIR)\zoomtst8.obj
+
+YAZ_CQL2PQF_OBJS = \
+   $(OBJDIR)\cql2pqf.obj
+YAZ_CQL2XCQL_OBJS = \
+   $(OBJDIR)\cql2xcql.obj
+YAZ_MARCDUMP_OBJS = \
+   $(OBJDIR)\marcdump.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-grs.obj" \
-	"$(OBJDIR)\ztest.obj" 
-	
-
-YAZ_ASN_OBJS= \
-   $(OBJDIR)\proto.obj \
-   $(OBJDIR)\prt-acc.obj \
-   $(OBJDIR)\prt-add.obj \
-   $(OBJDIR)\prt-arc.obj \
-   $(OBJDIR)\prt-dat.obj \
-   $(OBJDIR)\prt-dia.obj \
-   $(OBJDIR)\prt-esp.obj \
-   $(OBJDIR)\prt-exd.obj \
-   $(OBJDIR)\prt-exp.obj \
-   $(OBJDIR)\prt-grs.obj \
-   $(OBJDIR)\prt-rsc.obj \
-   $(OBJDIR)\prt-univ.obj 
+   "$(OBJDIR)\read-marc.obj" \
+   "$(OBJDIR)\read-grs.obj" \
+   "$(OBJDIR)\ztest.obj" 
+
+YAZ_CCL_OBJS= \
+   $(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)\comstack.obj \
@@ -262,15 +313,14 @@ YAZ_ODR_OBJS= \
    $(OBJDIR)\odr_null.obj \
    $(OBJDIR)\odr_oct.obj \
    $(OBJDIR)\odr_oid.obj \
-   $(OBJDIR)\odr_priv.obj \
    $(OBJDIR)\odr_seq.obj \
    $(OBJDIR)\odr_tag.obj \
    $(OBJDIR)\odr_use.obj \
    $(OBJDIR)\odr_util.obj 
 
 YAZ_UTIL_OBJS= \
+   $(OBJDIR)\version.obj \
    $(OBJDIR)\atoin.obj \
-   $(OBJDIR)\dmalloc.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
    $(OBJDIR)\nmem.obj \
@@ -281,39 +331,35 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\tpath.obj \
    $(OBJDIR)\wrbuf.obj \
    $(OBJDIR)\xmalloc.obj \
-   $(OBJDIR)\matchstr.obj 
+   $(OBJDIR)\matchstr.obj \
+   $(OBJDIR)\siconv.obj \
+   $(OBJDIR)\marc8.obj
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
    $(OBJDIR)\zget.obj \
-   $(OBJDIR)\prt-ext.obj \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
-   $(OBJDIR)\query.obj \
    $(OBJDIR)\yaz-ccl.obj \
-   $(OBJDIR)\otherinfo.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)\otherinfo.obj \
+   $(OBJDIR)\sortspec.obj \
+   $(OBJDIR)\z3950oid.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
 
 Z3950_OBJS= \
+   $(OBJDIR)\z-date.obj\
+   $(OBJDIR)\z-univ.obj\
+   $(OBJDIR)\zes-update.obj\
+   $(OBJDIR)\zes-admin.obj \
    $(OBJDIR)\z-accdes1.obj \
    $(OBJDIR)\z-accform1.obj \
    $(OBJDIR)\z-acckrb1.obj \
@@ -335,73 +381,80 @@ Z3950_OBJS= \
    $(OBJDIR)\zes-pquery.obj \
    $(OBJDIR)\zes-psched.obj \
    $(OBJDIR)\zes-pset.obj \
-   $(OBJDIR)\zes-update0.obj 
-
-COMMON_YAZ_OBJS= \
-   $(YAZ_COMSTACK_OBJS) \
-   $(YAZ_ODR_OBJS) \
+   $(OBJDIR)\zes-update0.obj \
+   $(OBJDIR)\prt-ext.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_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) \
+   $(Z3950_OBJS) \
+   $(ILL_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
-   $(YAZ_RET_OBJS)
-
-!if $(NEW_Z3950)
-YAZ_OBJS= \
-	$(COMMON_YAZ_OBJS) \
-	$(Z3950_OBJS)
-!else
-YAZ_OBJS= \
-	$(COMMON_YAZ_OBJS) \
-	$(YAZ_ASN_OBJS)
-!endif
+   $(YAZ_CCL_OBJS) \
+   $(YAZ_CQL_OBJS) \
+   $(YAZ_SERVER_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
-
-
-##########################################################
-############## proto.h
-##########################################################
-
-!if $(NEW_Z3950)
-$(PROTOH): makefile $(INCLDIR)\z-proto.h $(Z3950V3_H_FILES)
-	copy $(INCLDIR)\z-proto.h $(INCLDIR)\proto.h
-!else
-$(PROTOH): makefile $(INCLDIR)\prt-proto.h 
-	copy $(INCLDIR)\prt-proto.h $(INCLDIR)\proto.h
-!endif
-
-
-
 ###########################################################
 ############### Generated C and H files
-###########################################################
+#####
+######################################################
 
-Z3950_C_DIR=$(Z3950DIR)   #!!! Should be moved to OBJ
+Z3950_C_DIR=$(SRCDIR)   
+ILL_C_DIR=$(SRCDIR)
+#!!! Should be moved to OBJ, but that requires too much trickery
 
 # Files generated from datetime.asn
-DATETIME_H_FILES = z-date.h
-DATETIME_C_FILES = z-date.c
-DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES)
-$(DATETIME_C_FILES): $(DATETIME_H_FILES) 
-
+DATETIME_H_FILES = $(INCLDIR)\yaz\z-date.h
+DATETIME_C_FILES = $(Z3950_C_DIR)\z-date.c
 
 # Files generated from univres.asn
-UNIVRES_H_FILES = z-univ.h
-UNIVRES_C_FILES = z-univ.c
-UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES)
-$(UNIVRES_C_FILES): $(UNIVRES_H_FILES) 
+UNIVRES_H_FILES = $(INCLDIR)\yaz\z-univ.h
+UNIVRES_C_FILES = $(Z3950_C_DIR)\z-univ.c
 
 # Files generated from esupdate.asn
-ESUPDATE_H_FILES = zes-update.h
-ESUPDATE_C_FILES = zes-update.c
-ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_C_FILES)
-$(ESUPDATE_C_FILES): $(ESUPDATE_H_FILES) 
+ESUPDATE_H_FILES = $(INCLDIR)\yaz\zes-update.h
+ESUPDATE_C_FILES = $(Z3950_C_DIR)\zes-update.c
+
+# Files generated from esadmin.asn
+ESADMIN_H_FILES = $(INCLDIR)\yaz\zes-admin.h
+ESADMIN_C_FILES = $(Z3950_C_DIR)\zes-admin.c
+
+# Files generated from esadmin.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)\z-accdes1.h \
-   $(INCLDIR)\z-core.h
+   $(INCLDIR)\yaz\z-accdes1.h \
+   $(INCLDIR)\yaz\z-core.h
 
 Z3950V3_C_FILES= \
    $(Z3950_C_DIR)\z-accdes1.c \
@@ -425,24 +478,57 @@ Z3950V3_C_FILES= \
    $(Z3950_C_DIR)\zes-pquery.c \
    $(Z3950_C_DIR)\zes-psched.c \
    $(Z3950_C_DIR)\zes-pset.c \
-   $(Z3950_C_DIR)\zes-update0.c 
+   $(Z3950_C_DIR)\zes-update0.c
 
-Z3950V3_FILES= $(Z3950V3_C_FILES) $(Z3950V3_H_FILES)
+# Files generated from ill9702.asn
+ILL_CORE_H_FILES= \
+   $(INCLDIR)\yaz\ill-core.h
+
+ILL_CORE_C_FILES= \
+   $(ILL_C_DIR)\ill-core.c
+
+# Files generated from itemreq.asn
+ITEM_REQ_H_FILES= \
+   $(INCLDIR)\yaz\item-req.h
 
-$(Z3950V3_C_FILES): $(Z3950V3_H_FILES)
+ITEM_REQ_C_FILES= \
+   $(ILL_C_DIR)\item-req.c
+
+# Combined..
+DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES)
+UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES)
+ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_C_FILES)
+ESADMIN_FILES = $(ESADMIN_H_FILES) $(ESADMIN_C_FILES)
+Z3950V3_FILES= $(Z3950V3_C_FILES) $(Z3950V3_H_FILES)
+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)  \
    $(ESUPDATE_C_FILES) \
    $(UNIVRES_C_FILES)  \
-   $(DATETIME_C_FILES)
+   $(DATETIME_C_FILES) \
+   $(ESADMIN_C_FILES) \
+   $(CHARNEG_C_FILES) \
+   $(MTERM2_C_FILES) \
+   $(OCLCUI_C_FILES)
 
 GENERATED_H_FILES= \
    $(Z3950V3_H_FILES)  \
    $(ESUPDATE_H_FILES) \
    $(UNIVRES_H_FILES)  \
-   $(DATETIME_H_FILES)
+   $(DATETIME_H_FILES) \
+   $(ESADMIN_H_FILES) \
+   $(CHARNEG_H_FILES) \
+   $(MTERM2_H_FILES) \
+   $(OCLCUI_H_FILES)
 
+generated_files: \
+	$(GENERATED_H_FILES) \
+	$(GENERATED_C_FILES) \
 
 ###########################################################
 ############### Compiling 
@@ -451,167 +537,312 @@ 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"
-	/D"_MBCS"
-<<
-
+	@$(CPP) $(COPT) $< /D"_CONSOLE"
 
 # Server
 {$(SERVERDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	$(CPP) $(COPT) $< 
 
 # Various YAZ source directories
-{$(ASNDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+{$(SRCDIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
 
-{$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
-
-{$(ODRDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
-
-{$(ZUTILDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	$(CPP) $(COPT) $< 
 
-{$(RETDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+############### ASN-generated files
 
+!if $(HAVE_TCL)
+
+$(Z3950V3_FILES): $(SRCDIR)\z3950v3.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
+	@cd $(WINDIR)
+
+$(DATETIME_FILES): $(SRCDIR)\datetime.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl datetime.asn
+	@cd $(WINDIR)
+
+$(UNIVRES_FILES): $(SRCDIR)\univres.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl univres.asn
+	@cd $(WINDIR)
+
+$(ESUPDATE_FILES): $(SRCDIR)\esupdate.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl esupdate.asn
+	@cd $(WINDIR)
+
+$(ESADMIN_FILES): $(SRCDIR)\esadmin.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl esadmin.asn
+	@cd $(WINDIR)
+
+$(CHARNEG_FILES): $(SRCDIR)\charneg-3.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl charneg-3.asn
+	@cd $(WINDIR)
+
+$(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): $(SRCDIR)\item-req.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
+	@cd $(WINDIR)
+
+$(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm
+	@cd $(SRCDIR)
+	$(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+
+$(SRCDIR)\marc8_cjk.c: $(SRCDIR)\charconv_cjk.xml
+	@cd $(SRCDIR)
+	$(TCL) charconv.tcl -p marc8_cjk -s 50 charconv_cjk.xml -o marc8_cjk.c
 
-{$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
-
-### Resource file
-$(RESFILE): $(RCFILE) $(IDLGENERATED)
-	$(RSC) $(RCOPT) /fo"$(RESFILE)" $(RCFILE) 
+!endif
 
-############### ASN-generated files
+!if $(HAVE_BISON)
+$(SRCDIR)\cql.c: $(SRCDIR)\cql.y
+	@cd $(SRCDIR)
+	$(BISON) -y -p cql_ -o cql.c cql.y
 
+!endif
 
-$(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
-	@cd $(Z3950DIR)
-	$(TCL) $(TCLOPT) z3950v3.asn
-	copy *.h $(INCLDIR)  >NUL
+###########################################################
+############### Resources
+###########################################################
 
-$(DATETIME_FILES): $(Z3950DIR)\datetime.asn
-	@cd $(Z3950DIR)
-	$(TCL) $(TCLOPT) datetime.asn
-	copy *.h $(INCLDIR)  >NUL
+### The RC compiler (resource files)
+RSC=rc.exe
+COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
+DEBUG_RC_OPTIONS=/d "_DEBUG"
+RELEASE_RC_OPTIONS=/d "NDEBUG"
 
-$(UNIVRES_FILES): $(Z3950DIR)\univres.asn
-	@cd $(Z3950DIR)
-	$(TCL) $(TCLOPT) univres.asn
-	copy *.h $(INCLDIR)  >NUL
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_RC=$(WINDIR)\yaz.rc
 
-$(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn
-	@cd $(Z3950DIR)
-	$(TCL) $(TCLOPT) esupdate.asn
-	copy *.h $(INCLDIR)  >NUL
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
 
+$(YAZ_RES): $(YAZ_RC)
+	$(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) 
 
 ###########################################################
 ############### Linking
 ###########################################################
 
-###$(DLL) $(IMPLIB): "$(BINDIR)" $(Z3950_OBJS)
-
-$(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) 
+$(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 	@echo Linking the dll  $(DLL)
 	$(LINK) @<<
 		$(LNKOPT) 
 		$(LINK_LIBS) 
 		$(DLL_LINK_OPTIONS)
-		$(DLL_OBJS) 
+		$(DLL_OBJS)
+		$(YAZ_RES)
 		/out:$(DLL) 
-		/implib:$(IMPLIB)
-		/pdb:"$(LIBDIR)/yaz.pdb" 
-		/map:"$(LIBDIR)/yaz.map"  
+		/implib:"$(LIBDIR)\yaz.lib"
+		/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)
 <<
 
-#foo: 
-#	rem $(Z3950_OBJS)
-#	pause
-#	rem $(DLL_OBJS)
+$(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)
+<<
 
-foo: $(OBJDIR)\comstack.obj
-	echo foo
+$(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)
+<<
 
-$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) 
-	@echo Linking the client  $(CLIENT)
+$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) 
+	@echo Linking $(ZOOMTST5)
 	$(LINK) @<<
-            $(LNKOPT) 
+        $(LNKOPT) 
 		$(CLIENT_LINK_OPTIONS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
-		$(YAZ_CLIENT_OBJS) 
-		/out:$(CLIENT) 
+		$(YAZ_ZOOMTST5_OBJS)
+		/map:"$(LIBDIR)\zoomtst5.map"
+		/out:$(ZOOMTST5)
 <<
 
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(SERVER) $(DLL)
-	@echo Linking the ztest  $(ZTEST)
+$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) 
+	@echo Linking $(ZOOMTST6)
 	$(LINK) @<<
-            $(LNKOPT) 
+        $(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)
+<<
+
+$(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 $(ZTEST)
+	$(LINK) @<<
+        $(LNKOPT) 
 		$(ZTEST_LINK_OPTIONS)
 		$(LINK_LIBS) 
-		shell32.lib 
+		shell32.lib
 		$(IMPLIB)
-		$(SERVER)
 		$(ZTEST_OBJS) 
+		/implib:"$(LIBDIR)\yaz-ztest.lib"
+		/map:"$(LIBDIR)\yaz-ztest.map"
 		/out:$(ZTEST) 
 <<
 
-
-$(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS) 
-	@echo Linking the server  $(SERVER)
-	$(LINK) $(SERVER_LINK_OPTIONS) @<<
-		/nologo
+$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
+	@echo Linking $(YAZ_MARCDUMP)
+	$(LINK) @<<
+        $(LNKOPT) 
+		$(CLIENT_LINK_OPTIONS)
+		$(LINK_LIBS) 
+		shell32.lib
 		$(IMPLIB)
-		$(YAZ_SERVER_OBJS) 
-		/out:$(SERVER) 
+		$(YAZ_MARCDUMP_OBJS) 
+		/map:"$(LIBDIR)\yaz-marcdump.map"
+		/out:$(YAZ_MARCDUMP) 
 <<
 
-# 		$(LINK_LIBS) 
 
 # note that this links a lib, so it uses completely different options.
 
-
-
 ###########################################################
 ############### Special operations
 ###########################################################
@@ -619,68 +850,49 @@ $(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS)
 
 ############## clean
 clean:
-	del $(OBJDIR)\*.obj
-	del $(OBJDIR)\*.sbr
-	del $(DLL) 
-	del $(CLIENT)
-	del $(SERVER)
-	del $(ZTEST)
-	del $(TMPDIR)\*.
-	del $(PROTOH)
-	del $(Z3950_C_DIR)\*.c
+	-del $(BINDIR)\*.exe
+	-del $(BINDIR)\*.dll
+	-del $(TMPDIR)\*.
+	-del $(LIBDIR)\*.MAP
+	-del $(LIBDIR)\*.LIB
+	-del $(OBJDIR)\*.OBJ
+
+realclean: clean
+	-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)
+	-del $(UNIVRES_H_FILES)
+	-del $(ESUPDATE_H_FILES)
+
+# Because DOS del will only accept one file name to delete,
+# 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
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
- 	if not exist "$@/$(NUL)" mkdir "$@"
+	if not exist "$@/$(NUL)" mkdir "$@"
 
 
 ###########################################################
 ############### Explicit dependencies
 ###########################################################
 
-$(DLL_OBJS): makefile $(PROTOH) $(GENERATED_C_FILES)
-
-# Note: The objects depend on their own C file already, the
-# dependency here is actually to make sure we get the 
-# proper H files generated before trying to compile anything
-# Unfortunately make clean can not delete the H files so
-# easily. This hack assures that if the C's are deleted 
-# (as make clean does), the H's will be generated anew...
-
-
+# force recompilation of everything, if makefile changed
 
-###########################################################
-############### Log
-###########################################################
-#
-# $Log: makefile,v $
-# 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
-#
-#
+$(Z3950_OBJS): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 
+$(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 
+# makes sure we generate before compiling anything, as the
+# new proto.h refers to the generated files, and is included
+# in various places