X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=2fb991429efdaab26730077926e8ece76bed2608;hp=4ad963464aee0015dec40094b51b4181202e9801;hb=54db174ec4113c44b05f3766dc6f8ad665968cfb;hpb=8383a8bbc36d4ef3bf8393efcb2fe346570d6a46

diff --git a/win/makefile b/win/makefile
index 4ad9634..2fb9914 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.112 2006-07-05 13:05:32 adam Exp $
+# $Id: makefile,v 1.122 2006-12-15 12:37:18 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -16,15 +16,15 @@ HAVE_TCL=1
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR = c:\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.17.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=c:\libxml2-2.6.26.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -108,6 +108,7 @@ ZOOMTST6=$(BINDIR)\zoomtst6.exe
 ZOOMTST7=$(BINDIR)\zoomtst7.exe
 ZOOMTST8=$(BINDIR)\zoomtst8.exe
 ZOOMTST9=$(BINDIR)\zoomtst9.exe
+ZOOMTST10=$(BINDIR)\zoomtst10.exe
 
 CQL2PQF=$(BINDIR)\cql2pqf.exe
 CQL2XCQL=$(BINDIR)\cql2xcql.exe
@@ -121,7 +122,8 @@ client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
+ $(ZOOMTST10)
 
 utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
 
@@ -151,7 +153,7 @@ iconv:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
@@ -162,7 +164,7 @@ $(BINDIR)\zlib1.dll:
 
 !else
 LIBXML2_LIB=
-LIBXML2_DEF=/D HAVE_XML2=0
+LIBXML2_DEF=/D YAZ_HAVE_XML2=0
 libxml2: 
 
 !endif
@@ -171,7 +173,7 @@ libxml2:
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 LIBXSLT_DEF= \
 	/D HAVE_XSLTSAVERESULTTOSTRING=1 \
-	/D HAVE_XSLT=1 \
+	/D YAZ_HAVE_XSLT=1 \
 	/I"$(LIBXSLT_DIR)\include"
 libxslt: $(BINDIR)\libxslt.dll
 
@@ -180,7 +182,7 @@ $(BINDIR)\libxslt.dll:
 
 !else
 LIBXSLT_LIB=
-LIBXSLT_DEF=/D HAVE_XSLT=0
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
 libxslt: 
 !endif
 
@@ -280,6 +282,11 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\tabcomplete.obj \
    $(OBJDIR)\admin.obj
 
+ZTEST_OBJS= \
+    $(OBJDIR)\read-marc.obj \
+    $(OBJDIR)\read-grs.obj \
+    $(OBJDIR)\ztest.obj 
+
 YAZ_ZOOMSH_OBJS = \
    $(OBJDIR)\zoomsh.obj
 
@@ -301,6 +308,8 @@ YAZ_ZOOMTST8_OBJS = \
    $(OBJDIR)\zoomtst8.obj
 YAZ_ZOOMTST9_OBJS = \
    $(OBJDIR)\zoomtst9.obj
+YAZ_ZOOMTST10_OBJS = \
+   $(OBJDIR)\zoomtst10.obj
 
 YAZ_CQL2PQF_OBJS = \
    $(OBJDIR)\cql2pqf.obj
@@ -312,34 +321,24 @@ YAZ_MARCDUMP_OBJS = \
 TSTLOG_OBJS = \
    $(OBJDIR)\tstlog.obj
 
-YAZ_SERVER_OBJS= \
-   "$(OBJDIR)\eventl.obj" \
-   "$(OBJDIR)\requestq.obj" \
-   "$(OBJDIR)\service.obj" \
-   "$(OBJDIR)\seshigh.obj" \
-   "$(OBJDIR)\statserv.obj" \
-   "$(OBJDIR)\tcpdchk.obj" 
-
-ZTEST_OBJS= \
-   "$(OBJDIR)\read-marc.obj" \
-   "$(OBJDIR)\read-grs.obj" \
-   "$(OBJDIR)\ztest.obj" 
-
-YAZ_CCL_OBJS= \
+MISC_OBJS= \
+   $(OBJDIR)\version.obj \
+   $(OBJDIR)\eventl.obj \
+   $(OBJDIR)\requestq.obj \
+   $(OBJDIR)\service.obj \
+   $(OBJDIR)\seshigh.obj \
+   $(OBJDIR)\statserv.obj \
+   $(OBJDIR)\tcpdchk.obj \
    $(OBJDIR)\cclerrms.obj \
    $(OBJDIR)\cclfind.obj \
    $(OBJDIR)\cclptree.obj \
    $(OBJDIR)\cclqfile.obj \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
-   $(OBJDIR)\ccltoken.obj
-
-YAZ_COMSTACK_OBJS= \
+   $(OBJDIR)\ccltoken.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
-   $(OBJDIR)\waislen.obj 
-
-YAZ_ODR_OBJS= \
+   $(OBJDIR)\waislen.obj \
    $(OBJDIR)\ber_any.obj \
    $(OBJDIR)\ber_bit.obj \
    $(OBJDIR)\ber_bool.obj \
@@ -365,13 +364,13 @@ YAZ_ODR_OBJS= \
    $(OBJDIR)\odr_seq.obj \
    $(OBJDIR)\odr_tag.obj \
    $(OBJDIR)\odr_use.obj \
-   $(OBJDIR)\odr_util.obj 
-
-YAZ_UTIL_OBJS= \
-   $(OBJDIR)\version.obj \
+   $(OBJDIR)\odr_util.obj \
    $(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 \
@@ -387,10 +386,9 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\record_conv.obj \
    $(OBJDIR)\retrieval.obj \
    $(OBJDIR)\libxml2_error.obj \
-   $(OBJDIR)\test.obj
-
-YAZ_ZUTIL_OBJS= \
+   $(OBJDIR)\test.obj \
    $(OBJDIR)\diagbib1.obj \
+   $(OBJDIR)\diagsru_update.obj \
    $(OBJDIR)\diagsrw.obj \
    $(OBJDIR)\diag-entry.obj \
    $(OBJDIR)\zget.obj \
@@ -412,7 +410,15 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\initopt.obj \
    $(OBJDIR)\xmlquery.obj \
-   $(OBJDIR)\mime.obj
+   $(OBJDIR)\mime.obj \
+   $(OBJDIR)\cql.obj \
+   $(OBJDIR)\cqlstdio.obj \
+   $(OBJDIR)\cqlstring.obj \
+   $(OBJDIR)\cqltransform.obj \
+   $(OBJDIR)\cqlutil.obj \
+   $(OBJDIR)\cqlstrer.obj \
+   $(OBJDIR)\xcqlutil.obj \
+   $(OBJDIR)\elementset.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -451,27 +457,10 @@ ILL_OBJS= \
    $(OBJDIR)\ill-core.obj\
    $(OBJDIR)\item-req.obj
 
-YAZ_CQL_OBJS = \
-   $(OBJDIR)\cql.obj \
-   $(OBJDIR)\cqlstdio.obj \
-   $(OBJDIR)\cqlstring.obj \
-   $(OBJDIR)\cqltransform.obj \
-   $(OBJDIR)\cqlutil.obj \
-   $(OBJDIR)\cqlstrer.obj \
-   $(OBJDIR)\xcqlutil.obj
-
-YAZ_OBJS =\
-   $(YAZ_UTIL_OBJS) \
-   $(YAZ_ODR_OBJS) \
-   $(YAZ_COMSTACK_OBJS) \
+DLL_OBJS =\
+   $(MISC_OBJS) \
    $(Z3950_OBJS) \
    $(ILL_OBJS) \
-   $(YAZ_ZUTIL_OBJS) \
-   $(YAZ_CCL_OBJS) \
-   $(YAZ_CQL_OBJS) \
-   $(YAZ_SERVER_OBJS)
-
-DLL_OBJS= $(YAZ_OBJS)
 
 # Generated C and H files
 
@@ -570,7 +559,9 @@ GENERATED_C_FILES= \
    $(ESADMIN_C_FILES) \
    $(CHARNEG_C_FILES) \
    $(MTERM2_C_FILES) \
-   $(OCLCUI_C_FILES)
+   $(OCLCUI_C_FILES) \
+   $(ILL_CORE_C_FILES) \
+   $(ITEM_REQ_C_FILES)
 
 GENERATED_H_FILES= \
    $(Z3950V3_H_FILES)  \
@@ -580,11 +571,16 @@ GENERATED_H_FILES= \
    $(ESADMIN_H_FILES) \
    $(CHARNEG_H_FILES) \
    $(MTERM2_H_FILES) \
-   $(OCLCUI_H_FILES)
+   $(OCLCUI_H_FILES) \
+   $(ILL_CORE_H_FILES) \
+   $(ITEM_REQ_H_FILES)
 
 generated_files: \
 	$(GENERATED_H_FILES) \
 	$(GENERATED_C_FILES) \
+	$(SRCDIR)\diagsrw.c \
+	$(SRCDIR)\diagbib1.c \
+	$(SRCDIR)\diagsru_update.c 
 
 # Compiling 
 
@@ -686,6 +682,10 @@ $(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
 	@cd $(SRCDIR)
 	$(TCL) csvtosrw.tcl $(SRCDIR)
 
+$(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
+	@cd $(SRCDIR)
+	$(TCL) csvtosru_update.tcl $(SRCDIR)
+
 !endif
 
 !if $(HAVE_BISON)
@@ -721,106 +721,92 @@ $(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		$(DLL_OBJS) \
 		$(YAZ_RES) \
 		/out:$(DLL) \
-		/implib:"$(YAZ_IMPLIB)" \
-		/map:"$(LIBDIR)\yaz.map" 
+		/implib:"$(YAZ_IMPLIB)" 
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_CLIENT_OBJS) \
-		/map:"$(LIBDIR)\yaz-client.map" \
 		/out:$(CLIENT)
 
 $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMSH_OBJS) \
-		/map:"$(LIBDIR)\zoomsh.map" \
 		/out:$(ZOOMSH)
 
 $(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST1_OBJS) \
-		/map:"$(LIBDIR)\zoomtst1.map" \
 		/out:$(ZOOMTST1)
 
 $(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST2_OBJS) \
-		/map:"$(LIBDIR)\zoomtst2.map" \
 		/out:$(ZOOMTST2)
 
 $(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST3_OBJS) \
-		/map:"$(LIBDIR)\zoomtst3.map" \
 		/out:$(ZOOMTST3)
 
 $(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST4_OBJS) \
-		/map:"$(LIBDIR)\zoomtst4.map" \
 		/out:$(ZOOMTST4)
 
 $(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST5_OBJS) \
-		/map:"$(LIBDIR)\zoomtst5.map" \
 		/out:$(ZOOMTST5)
 
 $(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST6_OBJS) \
-		/map:"$(LIBDIR)\zoomtst6.map" \
 		/out:$(ZOOMTST6)
 
 $(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST7_OBJS) \
-		/map:"$(LIBDIR)\zoomtst7.map" \
 		/out:$(ZOOMTST7)
 
 $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST8_OBJS) \
-		/map:"$(LIBDIR)\zoomtst8.map" \
 		/out:$(ZOOMTST8)
 
-
 $(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_ZOOMTST9_OBJS) \
-		/map:"$(LIBDIR)\zoomtst9.map" \
 		/out:$(ZOOMTST9)
 
+$(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(DLL)
+	$(LINK_PROGRAM) \
+		$(YAZ_ZOOMTST10_OBJS) \
+		/out:$(ZOOMTST10)
+
 $(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_CQL2PQF_OBJS) \
-		/map:"$(LIBDIR)\cql2pqf.map" \
 		/out:$(CQL2PQF)
 
 $(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_CQL2XCQL_OBJS) \
-		/map:"$(LIBDIR)\cql2xcql.map" \
 		/out:$(CQL2XCQL)
 
 $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(ZTEST_OBJS) \
 		/implib:"$(LIBDIR)\yaz-ztest.lib" \
-		/map:"$(LIBDIR)\yaz-ztest.map" \
 		/out:$(ZTEST) 
 
 $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(YAZ_MARCDUMP_OBJS) \
-		/map:"$(LIBDIR)\yaz-marcdump.map" \
 		/out:$(YAZ_MARCDUMP) 
 
-
 $(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
 	$(LINK_PROGRAM) \
 		$(TSTLOG_OBJS) \
-		/map:"$(LIBDIR)\tstlog.map" \
 		/out:$(TSTLOG)
 
 # Other rules
@@ -835,7 +821,6 @@ clean:
 	-del $(BINDIR)\*.dll
 	-del $(BINDIR)\*.pdb
 	-del $(TMPDIR)\*.
-	-del $(LIBDIR)\*.MAP
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ