Split MARC reader functions out of marcdisp.c. Prepare for MARC format

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

diff --git a/win/makefile b/win/makefile
index 93d049e..2fb9914 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.117 2006-08-03 09:27:23 adam Exp $
+# $Id: makefile,v 1.122 2006-12-15 12:37:18 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -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)
 
@@ -306,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
@@ -319,8 +323,6 @@ TSTLOG_OBJS = \
 
 MISC_OBJS= \
    $(OBJDIR)\version.obj \
-   $(OBJDIR)\nfa.obj \
-   $(OBJDIR)\nfaxml.obj \
    $(OBJDIR)\eventl.obj \
    $(OBJDIR)\requestq.obj \
    $(OBJDIR)\service.obj \
@@ -366,6 +368,9 @@ 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 \
@@ -383,6 +388,7 @@ MISC_OBJS= \
    $(OBJDIR)\libxml2_error.obj \
    $(OBJDIR)\test.obj \
    $(OBJDIR)\diagbib1.obj \
+   $(OBJDIR)\diagsru_update.obj \
    $(OBJDIR)\diagsrw.obj \
    $(OBJDIR)\diag-entry.obj \
    $(OBJDIR)\zget.obj \
@@ -411,7 +417,8 @@ MISC_OBJS= \
    $(OBJDIR)\cqltransform.obj \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
-   $(OBJDIR)\xcqlutil.obj
+   $(OBJDIR)\xcqlutil.obj \
+   $(OBJDIR)\elementset.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -572,7 +579,8 @@ generated_files: \
        $(GENERATED_H_FILES) \
        $(GENERATED_C_FILES) \
        $(SRCDIR)\diagsrw.c \
-       $(SRCDIR)\diagbib1.c 
+       $(SRCDIR)\diagbib1.c \
+       $(SRCDIR)\diagsru_update.c 
 
 # Compiling 
 
@@ -674,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)
@@ -709,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
@@ -823,7 +821,6 @@ clean:
        -del $(BINDIR)\*.dll
        -del $(BINDIR)\*.pdb
        -del $(TMPDIR)\*.
-       -del $(LIBDIR)\*.MAP
        -del $(LIBDIR)\*.LIB
        -del $(OBJDIR)\*.OBJ