projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
a56674e
..
2fb9914
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1994-2006, Index Data ApS
# All rights reserved.
# Copyright (C) 1994-2006, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.115 2006-07-07 08:36:50 adam Exp $
+# $Id: makefile,v 1.122 2006-12-15 12:37:18 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-16,15
+16,15
@@
HAVE_TCL=1
# iconv charcter conversion utility
HAVE_ICONV=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
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.17.win32
# libxml2
HAVE_LIBXML2=1
# 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
# 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
ZOOMTST7=$(BINDIR)\zoomtst7.exe
ZOOMTST8=$(BINDIR)\zoomtst8.exe
ZOOMTST9=$(BINDIR)\zoomtst9.exe
+ZOOMTST10=$(BINDIR)\zoomtst10.exe
CQL2PQF=$(BINDIR)\cql2pqf.exe
CQL2XCQL=$(BINDIR)\cql2xcql.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) \
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)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
@@
-306,6
+308,8
@@
YAZ_ZOOMTST8_OBJS = \
$(OBJDIR)\zoomtst8.obj
YAZ_ZOOMTST9_OBJS = \
$(OBJDIR)\zoomtst9.obj
$(OBJDIR)\zoomtst8.obj
YAZ_ZOOMTST9_OBJS = \
$(OBJDIR)\zoomtst9.obj
+YAZ_ZOOMTST10_OBJS = \
+ $(OBJDIR)\zoomtst10.obj
YAZ_CQL2PQF_OBJS = \
$(OBJDIR)\cql2pqf.obj
YAZ_CQL2PQF_OBJS = \
$(OBJDIR)\cql2pqf.obj
@@
-319,7
+323,6
@@
TSTLOG_OBJS = \
MISC_OBJS= \
$(OBJDIR)\version.obj \
MISC_OBJS= \
$(OBJDIR)\version.obj \
- $(OBJDIR)\nfa.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
$(OBJDIR)\service.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
$(OBJDIR)\service.obj \
@@
-365,6
+368,9
@@
MISC_OBJS= \
$(OBJDIR)\atoin.obj \
$(OBJDIR)\log.obj \
$(OBJDIR)\marcdisp.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 \
$(OBJDIR)\nmem.obj \
$(OBJDIR)\nmemsdup.obj \
$(OBJDIR)\oid.obj \
@@
-382,6
+388,7
@@
MISC_OBJS= \
$(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
+ $(OBJDIR)\diagsru_update.obj \
$(OBJDIR)\diagsrw.obj \
$(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\diagsrw.obj \
$(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
@@
-410,7
+417,8
@@
MISC_OBJS= \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
- $(OBJDIR)\xcqlutil.obj
+ $(OBJDIR)\xcqlutil.obj \
+ $(OBJDIR)\elementset.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-551,7
+559,9
@@
GENERATED_C_FILES= \
$(ESADMIN_C_FILES) \
$(CHARNEG_C_FILES) \
$(MTERM2_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) \
GENERATED_H_FILES= \
$(Z3950V3_H_FILES) \
@@
-561,11
+571,16
@@
GENERATED_H_FILES= \
$(ESADMIN_H_FILES) \
$(CHARNEG_H_FILES) \
$(MTERM2_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) \
generated_files: \
$(GENERATED_H_FILES) \
$(GENERATED_C_FILES) \
+ $(SRCDIR)\diagsrw.c \
+ $(SRCDIR)\diagbib1.c \
+ $(SRCDIR)\diagsru_update.c
# Compiling
# Compiling
@@
-667,6
+682,10
@@
$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
@cd $(SRCDIR)
$(TCL) csvtosrw.tcl $(SRCDIR)
@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)
!endif
!if $(HAVE_BISON)
@@
-702,106
+721,92
@@
$(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
$(DLL_OBJS) \
$(YAZ_RES) \
/out:$(DLL) \
$(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) \
$(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) \
/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) \
/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) \
/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) \
/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) \
/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) \
/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) \
/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) \
/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) \
/out:$(ZOOMTST7)
$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
$(LINK_PROGRAM) \
$(YAZ_ZOOMTST8_OBJS) \
- /map:"$(LIBDIR)\zoomtst8.map" \
/out:$(ZOOMTST8)
/out:$(ZOOMTST8)
-
$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
$(LINK_PROGRAM) \
$(YAZ_ZOOMTST9_OBJS) \
$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
$(LINK_PROGRAM) \
$(YAZ_ZOOMTST9_OBJS) \
- /map:"$(LIBDIR)\zoomtst9.map" \
/out:$(ZOOMTST9)
/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) \
$(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) \
/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" \
/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) \
/out:$(ZTEST)
$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
$(LINK_PROGRAM) \
$(YAZ_MARCDUMP_OBJS) \
- /map:"$(LIBDIR)\yaz-marcdump.map" \
/out:$(YAZ_MARCDUMP)
/out:$(YAZ_MARCDUMP)
-
$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
$(LINK_PROGRAM) \
$(TSTLOG_OBJS) \
$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
$(LINK_PROGRAM) \
$(TSTLOG_OBJS) \
- /map:"$(LIBDIR)\tstlog.map" \
/out:$(TSTLOG)
# Other rules
/out:$(TSTLOG)
# Other rules
@@
-816,7
+821,6
@@
clean:
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
-del $(TMPDIR)\*.
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
-del $(TMPDIR)\*.
- -del $(LIBDIR)\*.MAP
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ