projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.3.10
[yazproxy-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
aff8420
..
fab1fe8
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,4
+1,4
@@
-# Copyright (C) 1998-2008 Index Data
+# Copyright (C) 1998-2011 Index Data
# All rights reserved.
###########################################################
# All rights reserved.
###########################################################
@@
-12,22
+12,16
@@
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# iconv charcter conversion utility
YAZPP_DIR=..\..\yazpp
# iconv charcter conversion utility
-HAVE_ICONV=1
+HAVE_ICONV=0
ICONV_DIR=\iconv-1.9.2.win32
# libxslt
HAVE_LIBXSLT=1
ICONV_DIR=\iconv-1.9.2.win32
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=\libxslt-1.1.23+.win32
+LIBXSLT_DIR=\libxslt-1.1.28.win32
# libxml2 (used by libxslt)
HAVE_LIBXML2=1
# libxml2 (used by libxslt)
HAVE_LIBXML2=1
-LIBXML2_DIR=\libxml2-2.6.32+.win32
-
-# zlib compression (used by libxml2)
-ZLIB_DIR=\zlib-1.2.3.win32
-
-# get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
-# http://www.zlatkovic.com/libxml.en.html
+LIBXML2_DIR=\libxml2-2.9.2.win32
default: all
default: all
@@
-72,11
+66,11
@@
dll: $(YAZPROXY_DLL)
proxy: $(YAZPROXY)
!if $(DEBUG)
proxy: $(YAZPROXY)
!if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp3d
+YAZD=yaz5d
+YAZPPD=yazpp6d
!else
!else
-YAZD=yaz3
-YAZPPD=yazpp3
+YAZD=yaz5
+YAZPPD=yazpp6
!endif
# YAZ includes & libs
!endif
# YAZ includes & libs
@@
-118,14
+112,10
@@
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)\zlib1.dll
+libxml2: $(BINDIR)\libxml2.dll
$(BINDIR)\libxml2.dll:
copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
$(BINDIR)\libxml2.dll:
copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
- copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
!else
LIBXML2_LIB=
LIBXML2_DEF=/D HAVE_XML2=0
!else
LIBXML2_LIB=
LIBXML2_DEF=/D HAVE_XML2=0
@@
-136,7
+126,7
@@
libxml2:
!if $(HAVE_LIBXSLT)
LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
LIBXSLT_DEF=/D YAZ_HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
!if $(HAVE_LIBXSLT)
LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
LIBXSLT_DEF=/D YAZ_HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
-libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
+libxslt: $(BINDIR)\libxslt.dll
$(BINDIR)\libxslt.dll:
copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
$(BINDIR)\libxslt.dll:
copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
@@
-201,11
+191,7
@@
LINK=link.exe
LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
$(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
$(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
-COMMON_LNK_OPTIONS=\
- /nologo \
- /subsystem:windows \
- /machine:i386 \
- /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
DEBUG_LNK_OPTIONS= /debug
DEBUG_LNK_OPTIONS= /debug