X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=7c78c143281cf11207b9bbac66678686446004ac;hp=f73956816cfdf1ee89974bac85a3d72f2cd0a777;hb=bbd768abbf09c38b0438e0186e50f3560b372dd9;hpb=699e7501d441803e6abd38bb8771cef20846a0d6

diff --git a/win/makefile b/win/makefile
index f739568..7c78c14 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1994-2006, Index Data ApS
+# Copyright (C) 1995-2007, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.120 2006-11-14 08:37:39 adam Exp $
+# $Id: makefile,v 1.137 2007-10-24 13:50:04 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -8,6 +8,7 @@
 # Parameters 
 
 DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 0
 
 # TCL
 TCL="C:\Tcl\bin\tclsh84.exe"
@@ -20,11 +21,11 @@ ICONV_DIR = c:\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.17.win32
+LIBXSLT_DIR=c:\libxslt-1.1.19.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.26.win32
+LIBXML2_DIR=c:\libxml2-2.6.28.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -88,11 +89,11 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazd.dll
-YAZ_IMPLIB=$(LIBDIR)\yazd.lib
+DLL=$(BINDIR)\yaz3d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib
 !else
-DLL=$(BINDIR)\yaz.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz.lib
+DLL=$(BINDIR)\yaz3.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz3.lib
 !endif
 
 CLIENT=$(BINDIR)\yaz-client.exe
@@ -115,6 +116,7 @@ CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
 TSTLOG=$(BINDIR)\tstlog.exe
+TST_TIMING=$(BINDIR)\tst_timing.exe
 
 # shortcut names defined here
 dll: dirs generate $(DLL) 
@@ -127,7 +129,7 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
 
 utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
 
-testprog: $(TSTLOG)
+testprog: $(TSTLOG) $(TST_TIMING)
 
 htmlhelp: $(DOCDIR)\htmlhelp.chm
 
@@ -234,9 +236,14 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
-           advapi32.lib uuid.lib wsock32.lib  advapi32.lib \
-           $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+LINK_LIBS= kernel32.lib wsock32.lib advapi32.lib \
+	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
 
@@ -280,7 +287,8 @@ LINK_DLL = $(LINK) $(LNKOPT) \
 YAZ_CLIENT_OBJS= \
    $(OBJDIR)\client.obj \
    $(OBJDIR)\tabcomplete.obj \
-   $(OBJDIR)\admin.obj
+   $(OBJDIR)\admin.obj \
+   $(OBJDIR)\fhistory.obj
 
 ZTEST_OBJS= \
     $(OBJDIR)\read-marc.obj \
@@ -321,10 +329,12 @@ YAZ_MARCDUMP_OBJS = \
 TSTLOG_OBJS = \
    $(OBJDIR)\tstlog.obj
 
+TST_TIMING_OBJS = \
+   $(OBJDIR)\tst_timing.obj
+
 MISC_OBJS= \
    $(OBJDIR)\version.obj \
-   $(OBJDIR)\nfa.obj \
-   $(OBJDIR)\nfaxml.obj \
+   $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
    $(OBJDIR)\requestq.obj \
    $(OBJDIR)\service.obj \
@@ -338,6 +348,7 @@ MISC_OBJS= \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
    $(OBJDIR)\ccltoken.obj \
+   $(OBJDIR)\ccl_stop_words.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
    $(OBJDIR)\waislen.obj \
@@ -370,9 +381,13 @@ MISC_OBJS= \
    $(OBJDIR)\atoin.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
+   $(OBJDIR)\marc_read_xml.obj \
+   $(OBJDIR)\marc_read_iso2709.obj \
+   $(OBJDIR)\marc_read_line.obj \
    $(OBJDIR)\nmem.obj \
    $(OBJDIR)\nmemsdup.obj \
-   $(OBJDIR)\oid.obj \
+   $(OBJDIR)\oid_db.obj \
+   $(OBJDIR)\oid_util.obj \
    $(OBJDIR)\options.obj \
    $(OBJDIR)\readconf.obj \
    $(OBJDIR)\tpath.obj \
@@ -380,6 +395,7 @@ MISC_OBJS= \
    $(OBJDIR)\xmalloc.obj \
    $(OBJDIR)\matchstr.obj \
    $(OBJDIR)\siconv.obj \
+   $(OBJDIR)\snprintf.obj \
    $(OBJDIR)\marc8.obj \
    $(OBJDIR)\marc8r.obj \
    $(OBJDIR)\record_conv.obj \
@@ -397,7 +413,6 @@ MISC_OBJS= \
    $(OBJDIR)\yaz-ccl.obj \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
-   $(OBJDIR)\z3950oid.obj \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
    $(OBJDIR)\opacdisp.obj \
@@ -407,6 +422,7 @@ MISC_OBJS= \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
    $(OBJDIR)\zoom-opt.obj \
+   $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\mime.obj \
@@ -417,7 +433,13 @@ MISC_OBJS= \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\xcqlutil.obj \
-   $(OBJDIR)\elementset.obj
+   $(OBJDIR)\elementset.obj \
+   $(OBJDIR)\timing.obj \
+   $(OBJDIR)\query-charset.obj \
+   $(OBJDIR)\tokenizer.obj \
+   $(OBJDIR)\copy_types.obj \
+   $(OBJDIR)\http.obj \
+   $(OBJDIR)\match_glob.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -600,7 +622,7 @@ generated_files: \
 
 # Various YAZ source directories
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) /D"YAZ_DLL" $< 
 
 {$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
@@ -673,6 +695,10 @@ $(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
 
+$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
+	@cd $(SRCDIR)
+	$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
+
 $(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
 	@cd $(SRCDIR)
 	$(TCL) csvtobib1.tcl $(SRCDIR)
@@ -719,94 +745,81 @@ $(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 	$(LINK_DLL) \
 		$(DLL_OBJS) \
 		$(YAZ_RES) \
-		/out:$(DLL) \
+		/out:$@ \
 		/implib:"$(YAZ_IMPLIB)" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_CLIENT_OBJS) \
-		/out:$(CLIENT)
+	$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMSH_OBJS) \
-		/out:$(ZOOMSH)
+	$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST1_OBJS) \
-		/out:$(ZOOMTST1)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST2_OBJS) \
-		/out:$(ZOOMTST2)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST3_OBJS) \
-		/out:$(ZOOMTST3)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST4_OBJS) \
-		/out:$(ZOOMTST4)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST5_OBJS) \
-		/out:$(ZOOMTST5)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST6_OBJS) \
-		/out:$(ZOOMTST6)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST7_OBJS) \
-		/out:$(ZOOMTST7)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST8_OBJS) \
-		/out:$(ZOOMTST8)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST9_OBJS) \
-		/out:$(ZOOMTST9)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_ZOOMTST10_OBJS) \
-		/out:$(ZOOMTST10)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_CQL2PQF_OBJS) \
-		/out:$(CQL2PQF)
+	$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_CQL2XCQL_OBJS) \
-		/out:$(CQL2XCQL)
+	$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(ZTEST_OBJS) \
-		/implib:"$(LIBDIR)\yaz-ztest.lib" \
-		/out:$(ZTEST) 
+	$(LINK_PROGRAM)	$(ZTEST_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(YAZ_MARCDUMP_OBJS) \
-		/out:$(YAZ_MARCDUMP) 
+	$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
-	$(LINK_PROGRAM) \
-		$(TSTLOG_OBJS) \
-		/out:$(TSTLOG)
+	$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
+$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(DLL)
+	$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 # Other rules