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

diff --git a/win/makefile b/win/makefile
index f165503..28509e4 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.44 2002-07-25 14:19:18 adam Exp $
+# $Id: makefile,v 1.52 2002-12-16 14:06:34 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -18,23 +18,21 @@
 #   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 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
-
-# expat
-HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.4
+DEBUG=0   # 0 for release, 1 for debug
 
 # iconv
-HAVE_ICONV=1
+HAVE_ICONV=0
 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
@@ -129,19 +127,6 @@ ICONV_DEF= \
 ICONV_LIB=
 !endif
 
-!if $(HAVE_EXPAT)
-EXPAT_DEF= \
-  /D HAVE_EXPAT_H=1 \
-  /I"$(EXPAT_DIR)\source\lib"
-EXPAT_LIB= \
-  "$(EXPAT_DIR)\libs\libexpat.lib"
-!else
-EXPAT_DEF= \
-  /D HAVE_EXPAT_H=0
-EXPAT_LIB=
-!endif
-  
-  
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
@@ -149,9 +134,9 @@ EXPAT_LIB=
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   $(ICONV_DEF)             \
-  $(EXPAT_DEF)             \
   /D "_WINDOWS"            \
   /D "WIN32"               \
+  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -190,7 +175,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
-           $(ICONV_LIB) $(EXPAT_LIB)
+           $(ICONV_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -327,7 +312,9 @@ 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 \
@@ -338,30 +325,8 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\z3950oid.obj \
-   $(OBJDIR)\charneg.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)\d1_if.obj\
-   $(OBJDIR)\d1_expat.obj
-
+   $(OBJDIR)\charneg.obj \
+   $(OBJDIR)\grs1disp.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -391,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\
@@ -408,7 +374,6 @@ COMMON_YAZ_OBJS= \
    $(YAZ_COMSTACK_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
    $(YAZ_CCL_OBJS) \
-   $(YAZ_RET_OBJS) \
    $(YAZ_SERVER_OBJS) \
    $(YAZ_ZOOM_OBJS)
 
@@ -453,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 \
@@ -505,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)  \
@@ -512,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)  \
@@ -520,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) \
@@ -614,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
@@ -624,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
 
 
@@ -869,7 +850,31 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.44  2002-07-25 14:19:18  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
+# New source grs1disp.c
+#
+# Revision 1.47  2002/09/06 20:04:49  adam
+# debug=0
+#
+# Revision 1.46  2002/08/30 11:28:01  adam
+# Remove EXPAT reader
+#
+# Revision 1.45  2002/08/27 22:33:30  adam
+# siconv added
+#
+# Revision 1.44  2002/07/25 14:19:18  adam
 # EXPAT support on WIN32
 #
 # Revision 1.43  2002/07/25 13:45:30  adam