WIN32 updates

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index acf94db..9533132 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2003, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.55 2003-02-18 21:27:53 adam Exp $
+# $Id: makefile,v 1.59 2003-06-03 09:11:13 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -10,11 +10,11 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 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
@@ -220,7 +220,7 @@ 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)
@@ -334,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 \
@@ -410,6 +411,7 @@ YAZ_CQL_OBJS = \
    $(OBJDIR)\cqlstring.obj \
    $(OBJDIR)\cqltransform.obj \
    $(OBJDIR)\cqlutil.obj \
+   $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\xcqlutil.obj
 
 COMMON_YAZ_OBJS= \
@@ -423,9 +425,9 @@ COMMON_YAZ_OBJS= \
    $(YAZ_CQL_OBJS)
 
 YAZ_OBJS= \
+       $(COMMON_YAZ_OBJS) \
        $(Z3950_OBJS) \
-       $(ILL_OBJS) \
-       $(COMMON_YAZ_OBJS)
+       $(ILL_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
@@ -651,7 +653,7 @@ $(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 charconv_cjk.xml -o marc8.c
 
 !endif
 
@@ -928,7 +930,19 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.55  2003-02-18 21:27:53  adam
+# 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