X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=28509e4a23fcb7105a11bb7a6262b8dc0e6a0eb9;hb=629799b5d2e09bbb9425442274424b12bdc801ba;hp=40a4ffea14d6cb8f46b7f72359bac807382c9436;hpb=4a30229e344fc242c25951daef62af68481067c2;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 40a4ffe..28509e4 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.49 2002-10-22 13:49:53 adam Exp $
+# $Id: makefile,v 1.52 2002-12-16 14:06:34 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -18,6 +18,7 @@
 #   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 
@@ -31,6 +32,7 @@ ICONV_DIR = c:\libiconv-1.7.0.1
 
 # TCL
 TCL="C:\Tcl\bin\tclsh83.exe"
+#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
 default: all
@@ -134,6 +136,7 @@ COMMON_C_OPTIONS=          \
   $(ICONV_DEF)             \
   /D "_WINDOWS"            \
   /D "WIN32"               \
+  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -310,8 +313,8 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\wrbuf.obj \
    $(OBJDIR)\xmalloc.obj \
    $(OBJDIR)\matchstr.obj \
-   $(OBJDIR)\siconv.obj
-
+   $(OBJDIR)\siconv.obj \
+   $(OBJDIR)\marc8.obj
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
@@ -353,7 +356,8 @@ Z3950_OBJS= \
    $(OBJDIR)\zes-pset.obj \
    $(OBJDIR)\zes-update0.obj \
    $(OBJDIR)\prt-ext.obj \
-   $(OBJDIR)\z-charneg.obj
+   $(OBJDIR)\z-charneg.obj \
+   $(OBJDIR)\z-mterm2.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
@@ -414,6 +418,10 @@ ESADMIN_C_FILES = $(Z3950_C_DIR)\zes-admin.c
 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 created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -466,6 +474,7 @@ 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)
 
 GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
@@ -473,7 +482,8 @@ GENERATED_C_FILES= \
    $(UNIVRES_C_FILES)  \
    $(DATETIME_C_FILES) \
    $(ESADMIN_C_FILES) \
-   $(CHARNEG_C_FILES)
+   $(CHARNEG_C_FILES) \
+   $(MTERM2_C_FILES)
 
 GENERATED_H_FILES= \
    $(Z3950V3_H_FILES)  \
@@ -481,7 +491,8 @@ GENERATED_H_FILES= \
    $(UNIVRES_H_FILES)  \
    $(DATETIME_H_FILES) \
    $(ESADMIN_H_FILES) \
-   $(CHARNEG_H_FILES)
+   $(CHARNEG_H_FILES) \
+   $(MTERM2_H_FILES)
 
 generated_files: \
 	$(GENERATED_H_FILES) \
@@ -575,6 +586,11 @@ $(CHARNEG_FILES): $(Z3950DIR)\charneg-3.asn
 	$(TCL) $(TCLOPT) -d z.tcl charneg-3.asn
 	@cd $(WINDIR)
 
+$(MTERM2_FILES): $(Z3950DIR)\mterm2.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl mterm2.asn
+	@cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
 	@cd $(ILLDIR)
 	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@@ -585,6 +601,10 @@ $(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
 	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
 	@cd $(WINDIR)
 
+$(UTILDIR)\marc8.c: $(UTILDIR)\charconv.sgm
+	@cd $(UTILDIR)
+	$(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm marc8.c
+
 !endif
 
 
@@ -830,7 +850,16 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.49  2002-10-22 13:49:53  adam
+# Revision 1.52  2002-12-16 14:06:34  adam
+# WIN32 updates for marc8.c
+#
+# Revision 1.51  2002/12/05 12:16:39  adam
+# yaz_strerror. WIN32 updates for mterm2.asn
+#
+# Revision 1.50  2002/10/24 12:14:01  heikki
+# Using a default path to find tcl
+#
+# Revision 1.49  2002/10/22 13:49:53  adam
 # data1 gone
 #
 # Revision 1.48  2002/10/22 10:32:46  adam