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
Make test fail if circular refenced ODR does not fail
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
001364e
..
d69f4fe
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,10
+1,9
@@
-# Copyright (C) 1994-2004, Index Data
+# Copyright (C) 1994-2005, Index Data ApS
# All rights reserved.
# All rights reserved.
-# $Id: makefile,v 1.81 2004-08-18 09:01:13 adam Exp $
+# $Id: makefile,v 1.94 2005-04-22 14:51:11 adam Exp $
#
# Programmed by
#
# Programmed by
-# HL: Heikki Levanto, Index Data
-#
+# Heikki Levanto & Adam Dickmeiss
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-23,13
+22,13
@@
ICONV_DIR = c:\iconv-1.9.1.win32
# libxml2
HAVE_LIBXML2=1
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.9.win32
+LIBXML2_DIR=c:\libxml2-2.6.19.win32
# zlib compression (used by libxml2)
# zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.1.4.win32
+ZLIB_DIR = c:\zlib-1.2.2.win32
# get WIN32 binaries libxml2 & iconv & zlib from here:
# get WIN32 binaries libxml2 & iconv & zlib from here:
-# http://www.zlatkovic.com/projects/libxml/binaries.html
+# http://www.zlatkovic.com/libxml.en.html
# bison
HAVE_BISON=1
# bison
HAVE_BISON=1
@@
-41,13
+40,15
@@
all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
NSIS="c:\program files\nsis\makensis.exe"
NSIS="c:\program files\nsis\makensis.exe"
-nsis:
+dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=1
nmake DEBUG=0
$(NSIS) yaz.nsi
nmake DEBUG=0
$(NSIS) yaz.nsi
+nsis:
+ $(NSIS) yaz.nsi
+
nsishelp:
$(NSIS)
nsishelp:
$(NSIS)
@@
-86,8
+87,8
@@
TMP=$(TMPDIR)
###########################################################
!if $(DEBUG)
###########################################################
!if $(DEBUG)
-DLL=$(BINDIR)\yazdebug.dll
-IMPLIB=$(LIBDIR)\yazdebug.lib
+DLL=$(BINDIR)\yazd.dll
+IMPLIB=$(LIBDIR)\yazd.lib
!else
DLL=$(BINDIR)\yaz.dll
IMPLIB=$(LIBDIR)\yaz.lib
!else
DLL=$(BINDIR)\yaz.dll
IMPLIB=$(LIBDIR)\yaz.lib
@@
-111,9
+112,9
@@
CQL2XCQL=$(BINDIR)\cql2xcql.exe
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
# shortcut names defined here
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
# shortcut names defined here
-dll : $(DLL)
-client: $(CLIENT)
-ztest: $(ZTEST)
+dll: dirs generate $(DLL)
+client: dirs generate $(CLIENT)
+ztest: dirs generate $(ZTEST)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
@@
-145,13
+146,13
@@
iconv:
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
$(BINDIR)\libxml2.dll:
- copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+ copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-$(BINDIR)\zlib.dll:
- copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+$(BINDIR)\zlib1.dll:
+ copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
!else
LIBXML2_LIB=
!else
LIBXML2_LIB=
@@
-171,7
+172,6
@@
COMMON_C_OPTIONS= \
$(LIBXML2_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
$(LIBXML2_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
- /D "HAVE_WCHAR_H=1" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
@@
-359,6
+359,8
@@
YAZ_UTIL_OBJS= \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
+ $(OBJDIR)\diagsrw.obj \
+ $(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\pquery.obj \
@@
-639,6
+641,14
@@
$(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
@cd $(SRCDIR)
$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
@cd $(SRCDIR)
$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
+$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtobib1.tcl
+
+$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
+ @cd $(SRCDIR)
+ $(TCL) csvtosrw.tcl
+
!endif
!if $(HAVE_BISON)
!endif
!if $(HAVE_BISON)