X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=071fb54ede9109f2cd22314717bf509149591460;hb=75ada5241cd3a0adf2a5623c7a392dd657e2c15b;hp=0d4f26f8ca49f91e630377b6b8044dd582fe421f;hpb=97e3dda0b95f4f7a86d1bab2a0ba8eceaeff44ca;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 0d4f26f..071fb54 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1994-2003, Index Data
+# Copyright (C) 1994-2004, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.66 2003-10-27 12:32:03 adam Exp $
+# $Id: makefile,v 1.74 2004-03-17 18:47:42 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -197,7 +197,7 @@ COMMON_LNK_OPTIONS= /nologo \
 
 DEBUG_LNK_OPTIONS= /debug 
 
-RELEASE_LNK_OPTIONS=  /pdb:none
+RELEASE_LNK_OPTIONS=
 
 DLL_LINK_OPTIONS= /dll  
 CLIENT_LINK_OPTIONS = /subsystem:console  
@@ -350,8 +350,10 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
    $(OBJDIR)\srw.obj \
+   $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
-   $(OBJDIR)\zoom-opt.obj
+   $(OBJDIR)\zoom-opt.obj \
+   $(OBJDIR)\initopt.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -611,9 +613,9 @@ $(ITEM_REQ_FILES): $(SRCDIR)\item-req.asn
 	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
 	@cd $(WINDIR)
 
-$(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm
+$(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
-	$(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+	$(TCL) charconv.tcl -O 1 -p marc8 charconv.sgm codetables.xml -o marc8.c
 
 !endif
 
@@ -660,7 +662,6 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		$(YAZ_RES)
 		/out:$(DLL) 
 		/implib:"$(LIBDIR)\yaz.lib"
-		/pdb:"$(LIBDIR)\yaz.pdb" 
 		/map:"$(LIBDIR)\yaz.map"  
 <<
 
@@ -672,7 +673,6 @@ $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_CLIENT_OBJS)
-		/pdb:"$(LIBDIR)\yaz-client.pdb"
 		/map:"$(LIBDIR)\yaz-client.map"
 		/out:$(CLIENT)
 <<
@@ -685,7 +685,6 @@ $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMSH_OBJS)
-		/pdb:"$(LIBDIR)\zoomsh.pdb"
 		/map:"$(LIBDIR)\zoomsh.map"
 		/out:$(ZOOMSH)
 <<
@@ -698,7 +697,6 @@ $(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST1_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst1.pdb"
 		/map:"$(LIBDIR)\zoomtst1.map"
 		/out:$(ZOOMTST1)
 <<
@@ -711,7 +709,6 @@ $(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST2_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst2.pdb"
 		/map:"$(LIBDIR)\zoomtst2.map"
 		/out:$(ZOOMTST2)
 <<
@@ -724,7 +721,6 @@ $(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST3_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst3.pdb"
 		/map:"$(LIBDIR)\zoomtst3.map"
 		/out:$(ZOOMTST3)
 <<
@@ -737,7 +733,6 @@ $(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST4_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst4.pdb"
 		/map:"$(LIBDIR)\zoomtst4.map"
 		/out:$(ZOOMTST4)
 <<
@@ -750,7 +745,6 @@ $(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST5_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst5.pdb"
 		/map:"$(LIBDIR)\zoomtst5.map"
 		/out:$(ZOOMTST5)
 <<
@@ -763,7 +757,6 @@ $(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST6_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst6.pdb"
 		/map:"$(LIBDIR)\zoomtst6.map"
 		/out:$(ZOOMTST6)
 <<
@@ -776,7 +769,6 @@ $(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST7_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst7.pdb"
 		/map:"$(LIBDIR)\zoomtst7.map"
 		/out:$(ZOOMTST7)
 <<
@@ -789,7 +781,6 @@ $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_ZOOMTST8_OBJS)
-		/pdb:"$(LIBDIR)\zoomtst8.pdb"
 		/map:"$(LIBDIR)\zoomtst8.map"
 		/out:$(ZOOMTST8)
 <<
@@ -802,7 +793,6 @@ $(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_CQL2PQF_OBJS)
-		/pdb:"$(LIBDIR)\cql2pqf.pdb"
 		/map:"$(LIBDIR)\cql2pqf.map"
 		/out:$(CQL2PQF)
 <<
@@ -815,7 +805,6 @@ $(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
 		$(YAZ_CQL2XCQL_OBJS)
-		/pdb:"$(LIBDIR)\cql2xcql.pdb"
 		/map:"$(LIBDIR)\cql2xcql.map"
 		/out:$(CQL2XCQL)
 <<
@@ -830,7 +819,6 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 		$(IMPLIB)
 		$(ZTEST_OBJS) 
 		/implib:"$(LIBDIR)\yaz-ztest.lib"
-		/pdb:"$(LIBDIR)\yaz-ztest.pdb"
 		/map:"$(LIBDIR)\yaz-ztest.map"
 		/out:$(ZTEST) 
 <<
@@ -844,7 +832,6 @@ $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
 		shell32.lib
 		$(IMPLIB)
 		$(YAZ_MARCDUMP_OBJS) 
-		/pdb:"$(LIBDIR)\yaz-marcdump.pdb"
 		/map:"$(LIBDIR)\yaz-marcdump.map"
 		/out:$(YAZ_MARCDUMP) 
 <<