X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=1f60dfaf800aa8d851cb58244ae5cb9535333256;hb=ab6f8762c003a867d0e1eb8ac5686a99de47976a;hp=20c3ee2fed5d85c03af904e34cac3fa249acf7ae;hpb=96dd068fd2057b2123ae9444fa441e4738776d87;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 20c3ee2..1f60dfa 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.21 2001-02-28 16:56:33 adam Exp $
+# $Id: makefile,v 1.26 2001-09-27 12:09:18 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -31,7 +31,7 @@ NEW_Z3950=1  # 0= use old asn files
 
 default: all
 
-all: dirs proto_h dll client ztest 
+all: dirs yaz_date_h proto_h dll client ztest 
 
 generate: generated_files
 
@@ -78,12 +78,14 @@ IMPLIB=$(LIBDIR)\Yaz.lib
 CLIENT=$(BINDIR)\yaz-client.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
 PROTOH=$(INCLDIR)\yaz\proto.h
+YAZ_DATE_H=$(INCLDIR)\yaz\yaz-date.h
 
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
 ztest: $(ZTEST)
 proto_h: $(PROTOH)
+yaz_date_h: $(YAZ_DATE_H)
 
 ###########################################################
 ############### Compiler and linker options 
@@ -96,6 +98,7 @@ proto_h: $(PROTOH)
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
+  /D "YAZ_MODULE_ill=1"    \
   /D "WIN32" /D "_WINDOWS" \
   /D "CCL2RPN=1"           \
   /FR"$(OBJDIR)\\"         \
@@ -152,7 +155,7 @@ SERVER_LINK_OPTIONS = -lib
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
 # TCL
-TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
 COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
@@ -276,7 +279,10 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
    $(OBJDIR)\yaz-ccl.obj \
-   $(OBJDIR)\otherinfo.obj
+   $(OBJDIR)\otherinfo.obj \
+   $(OBJDIR)\sortspec.obj \
+   $(OBJDIR)\z3950oid.obj
+
 
 YAZ_RET_OBJS= \
    $(OBJDIR)\d1_absyn.obj\
@@ -526,6 +532,11 @@ generated_files: \
 
 !if $(HAVE_TCL)
 
+$(YAZ_DATE_H):
+	@cd ..
+	$(TCL) util\cvs-date.tcl include\yaz\yaz-date.h
+	@cd win
+
 $(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
 	@cd $(Z3950DIR)
 	$(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
@@ -698,7 +709,23 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.21  2001-02-28 16:56:33  adam
+# Revision 1.26  2001-09-27 12:09:18  adam
+# Function nmem_exit calls oid_exit (when reference is 0).
+#
+# Revision 1.25  2001/09/24 21:51:56  adam
+# New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
+# and yaz_z3950oid_to_str.
+#
+# Revision 1.24  2001/08/14 12:05:58  adam
+# Added sortspec.
+#
+# Revision 1.23  2001/05/18 11:42:03  adam
+# YAZ Build date for WIN32.
+#
+# Revision 1.22  2001/03/09 14:58:20  adam
+# Updated version resource.
+#
+# Revision 1.21  2001/02/28 16:56:33  adam
 # Added version info for WIN32.
 #
 # Revision 1.20  2000/12/01 17:56:41  adam