X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=6de6dca19018366a3ea46094dfe31ab2828d625e;hb=b52f95652272f117311f5ec35e61037589f7671e;hp=e5c0e2d3d4c674c0117647a44ad7da38898d8444;hpb=f1d9f7b3b3ba4e39f261f9b820dad51b8754549c;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index e5c0e2d..6de6dca 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.35 2002-03-16 10:26:57 adam Exp $
+# $Id: makefile,v 1.37 2002-05-17 12:48:30 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -27,7 +27,7 @@ DEBUG=0   # 0 for release, 1 for debug
 
 default: all
 
-all: dirs yaz_date_h generate dll client ztest zoomsh
+all: dirs generate dll client ztest zoomsh
 
 NSIS="c:\program files\nsis\makensis.exe"
 
@@ -83,7 +83,6 @@ IMPLIB=$(LIBDIR)\Yaz.lib
 CLIENT=$(BINDIR)\yaz-client.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
-YAZ_DATE_H=$(INCLDIR)\yaz\yaz-date.h
 
 ZOOMTST1=$(BINDIR)\zoomtst1.exe
 ZOOMTST2=$(BINDIR)\zoomtst2.exe
@@ -102,8 +101,6 @@ ztest: $(ZTEST)
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
 
-yaz_date_h: $(YAZ_DATE_H)
-
 ###########################################################
 ############### Compiler and linker options 
 ###########################################################
@@ -239,6 +236,7 @@ YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\tcpdchk.obj" 
 
 ZTEST_OBJS= \
+	"$(OBJDIR)\read-marc.obj" \
 	"$(OBJDIR)\read-grs.obj" \
 	"$(OBJDIR)\ztest.obj" 
 
@@ -550,11 +548,6 @@ 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
@@ -841,7 +834,13 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.35  2002-03-16 10:26:57  adam
+# Revision 1.37  2002-05-17 12:48:30  adam
+# Use __stdcall convention for ZOOM on WIN32
+#
+# Revision 1.36  2002/03/18 21:33:48  adam
+# MARC records embedded in C code for test server
+#
+# Revision 1.35  2002/03/16 10:26:57  adam
 # Added NSIS rules (nmake nsis).
 #
 # Revision 1.34  2002/02/12 15:59:12  adam