X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=2dedbe5067bff05db418363147019b843a81fee3;hb=6aa60532542a01bfe78be0c91cbf57ce7cf851ce;hp=e9198758105ff61ca229e00c282e0e56f8413991;hpb=0e835ef58f6a0939626e6911a730945f81fa2e2f;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index e919875..2dedbe5 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,24 +1,10 @@
-# makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.54 2003-02-18 09:11:50 adam Exp $
+# Copyright (C) 1994-2003, Index Data
+# All rights reserved.
+# $Id: makefile,v 1.64 2003-09-04 18:52:02 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
-# - You may have to edit the path to tcl below
 
 ###########################################################
 ############### Parameters 
@@ -27,8 +13,8 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # TCL
-#TCL="C:\Tcl\bin\tclsh83.exe"
-TCL="C:\Program Files\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
@@ -37,14 +23,18 @@ ICONV_DIR = c:\iconv-1.8.win32
 
 # 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
 
+# bison
+HAVE_BISON=1
+BISON=bison
+
 default: all
 
-all: dirs generate dll client ztest zoomsh iconv libxml2
+all: dirs generate dll client ztest zoomsh cqlprog iconv libxml2
 
 NSIS="c:\program files\nsis\makensis-bz2.exe"
 
@@ -60,8 +50,8 @@ 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
@@ -81,6 +71,8 @@ Z3950DIR=$(SRCDIR)\Z39.50
 ILLDIR=$(SRCDIR)\ill
 CCLDIR=$(SRCDIR)\ccl
 ZOOMDIR=$(SRCDIR)\zoom
+CQLDIR=$(SRCDIR)\cql
+
 
 CLIENTDIR=$(SRCDIR)\CLIENT
 SERVERDIR=$(SRCDIR)\SERVER
@@ -93,8 +85,8 @@ 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
@@ -109,6 +101,9 @@ ZOOMTST6=$(BINDIR)\zoomtst6.exe
 ZOOMTST7=$(BINDIR)\zoomtst7.exe
 ZOOMTST8=$(BINDIR)\zoomtst8.exe
 
+CQL2PQF=$(BINDIR)\cql2pqf.exe
+CQL2XCQL=$(BINDIR)\cql2xcql.exe
+
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
@@ -117,6 +112,8 @@ ztest: $(ZTEST)
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
 
+cqlprog: $(CQL2PQF) $(CQL2XCQL)
+
 ###########################################################
 ############### Compiler and linker options 
 ###########################################################
@@ -219,8 +216,11 @@ CLIENT_LINK_OPTIONS = /subsystem:console
 ZOOMSH_LINK_OPTIONS = /subsystem:console
 SERVER_LINK_OPTIONS = -lib 
 ZTEST_LINK_OPTIONS = /subsystem:console  
+CQL2PQF_LINK_OPTIONS = /subsystem:console  
+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)
@@ -273,6 +273,11 @@ YAZ_ZOOMTST7_OBJS = \
 YAZ_ZOOMTST8_OBJS = \
    $(OBJDIR)\zoomtst8.obj
 
+YAZ_CQL2PQF_OBJS = \
+   $(OBJDIR)\cql2pqf.obj
+YAZ_CQL2XCQL_OBJS = \
+   $(OBJDIR)\cql2xcql.obj
+
 YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\eventl.obj" \
 	"$(OBJDIR)\requestq.obj" \
@@ -329,6 +334,7 @@ YAZ_ODR_OBJS= \
    $(OBJDIR)\odr_util.obj 
 
 YAZ_UTIL_OBJS= \
+   $(OBJDIR)\version.obj \
    $(OBJDIR)\atoin.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
@@ -355,9 +361,12 @@ YAZ_ZUTIL_OBJS= \
    $(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\
@@ -388,30 +397,33 @@ Z3950_OBJS= \
    $(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_OBJS= \
-	$(Z3950_OBJS) \
-	$(ILL_OBJS) \
-	$(COMMON_YAZ_OBJS)
+   $(YAZ_CQL_OBJS) \
+   $(YAZ_SERVER_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
@@ -453,6 +465,10 @@ CHARNEG_C_FILES = $(Z3950_C_DIR)\z-charneg.c
 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 \
@@ -506,6 +522,7 @@ 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)  \
@@ -514,7 +531,8 @@ GENERATED_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)  \
@@ -523,7 +541,8 @@ GENERATED_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) \
@@ -540,7 +559,7 @@ generated_files: \
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
 	@$(CPP) $(COPT) $<
 
-# Yaz client
+# yaz client
 {$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
 	@$(CPP) $(COPT) $< /D"_CONSOLE"
 
@@ -583,6 +602,9 @@ generated_files: \
 {$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
+{$(CQLDIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
+
 ############### ASN-generated files
 
 !if $(HAVE_TCL)
@@ -622,6 +644,11 @@ $(MTERM2_FILES): $(Z3950DIR)\mterm2.asn
 	$(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
@@ -634,10 +661,16 @@ $(ITEM_REQ_FILES): $(ILLDIR)\item-req.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
 
+!if $(HAVE_BISON)
+$(CQLDIR)\cql.c: $(CQLDIR)\cql.y
+	@cd $(CQLDIR)
+	$(BISON) -y -p cql_ -o cql.c cql.y
+
+!endif
 
 ###########################################################
 ############### Resources
@@ -809,6 +842,32 @@ $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
 		/out:$(ZOOMTST8)
 <<
 
+$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) 
+	@echo Linking $(CQL2PQF)
+	$(LINK) @<<
+        $(LNKOPT) 
+		$(CQL2PQF_LINK_OPTIONS)
+		$(LINK_LIBS) 
+		$(IMPLIB)
+		$(YAZ_CQL2PQF_OBJS)
+		/pdb:"$(LIBDIR)\cql2pqf.pdb"
+		/map:"$(LIBDIR)\cql2pqf.map"
+		/out:$(CQL2PQF)
+<<
+
+$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) 
+	@echo Linking $(CQL2XCQL)
+	$(LINK) @<<
+        $(LNKOPT) 
+		$(CQL2XCQL_LINK_OPTIONS)
+		$(LINK_LIBS) 
+		$(IMPLIB)
+		$(YAZ_CQL2XCQL_OBJS)
+		/pdb:"$(LIBDIR)\cql2xcql.pdb"
+		/map:"$(LIBDIR)\cql2xcql.map"
+		/out:$(CQL2XCQL)
+<<
+
 $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 	@echo Linking the ztest  $(ZTEST)
 	$(LINK) @<<
@@ -824,7 +883,6 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 		/out:$(ZTEST) 
 <<
 
-
 # note that this links a lib, so it uses completely different options.
 
 ###########################################################
@@ -837,13 +895,12 @@ clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
-
 	-del $(LIBDIR)\*.MAP
-
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ
 
 realclean: clean
+	-del $(CQLDIR)\cql.c
 	-del $(Z3950_C_DIR)\z*.c
 	-del $(INCLDIR)\yaz\z-accdes1.h
 	-del $(INCLDIR)\yaz\z-core.h
@@ -881,7 +938,37 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.54  2003-02-18 09:11:50  adam
+# 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
+# CQL w/bison on WIN32
+#
+# Revision 1.54  2003/02/18 09:11:50  adam
 # Prepare for external utilties: iconv, libxml2 on WIN32
 #
 # Revision 1.53  2003/02/17 22:34:39  adam