No more @-tag for MARC

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

diff --git a/win/makefile b/win/makefile
index 8f34919..2bd8fd5 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.36 2002-03-18 21:33:48 adam Exp $
+# $Id: makefile,v 1.38 2002-05-18 09:52:37 oleg 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 
 ###########################################################
@@ -307,7 +304,8 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\yaz-ccl.obj \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
-   $(OBJDIR)\z3950oid.obj
+   $(OBJDIR)\z3950oid.obj \
+   $(OBJDIR)\charneg.obj
 
 
 YAZ_RET_OBJS= \
@@ -551,11 +549,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
@@ -842,7 +835,15 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.36  2002-03-18 21:33:48  adam
+# Revision 1.38  2002-05-18 09:52:37  oleg
+# Added support of CharacterSetandLanguageNegotiation-3
+# modele (based on Z_PrivateCharacterSet_externallySpecified) at the client
+# side.
+#
+# 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