Towards 2.0.4

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

diff --git a/win/makefile b/win/makefile
index 9533132..0191c3d 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.59 2003-06-03 09:11:13 adam Exp $
+# $Id: makefile,v 1.63 2003-07-25 11:11:19 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -10,7 +10,7 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug
 
 # TCL
 TCL="C:\Tcl\bin\tclsh84.exe"
@@ -18,11 +18,11 @@ TCL="C:\Tcl\bin\tclsh84.exe"
 HAVE_TCL=1
 
 # iconv charcter conversion utility
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR = c:\iconv-1.8.win32
 
 # libxml2
-HAVE_LIBXML2=1
+HAVE_LIBXML2=0
 LIBXML2_DIR=c:\libxml2-2.5.3.win32
 
 # WIN32 binaries libxml2 & iconv from here:
@@ -361,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\
@@ -394,17 +397,14 @@ 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 \
@@ -414,20 +414,16 @@ YAZ_CQL_OBJS = \
    $(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)
 
@@ -469,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 \
@@ -522,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)  \
@@ -530,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)  \
@@ -539,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) \
@@ -641,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
@@ -653,7 +661,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 charconv_cjk.xml -o marc8.c
+       $(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
 
 !endif
 
@@ -930,7 +938,19 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.59  2003-06-03 09:11:13  adam
+# 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