-# Copyright (C) 1993-2004, Index Data ApS
+# Copyright (C) 1993-2006, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.2 2004-04-11 17:51:10 adam Exp $
+# $Id: makefile,v 1.7 2006-04-30 13:20:47 adam Exp $
###########################################################
############### Parameters
DEBUG=0 # 0 for release, 1 for debug
# YAZ and YAZ++
-YAZ_DIR=c:\yaz
-YAZPP_DIR=c:\yaz++
+YAZ_DIR=..\..\yaz
+YAZPP_DIR=..\..\yazpp
# iconv charcter conversion utility
HAVE_ICONV=1
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.4.win32
+LIBXSLT_DIR=c:\libxslt-1.1.14.win32
# libxml2 (used by libxslt)
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.7.win32
+LIBXML2_DIR=c:\libxml2-2.6.20.win32
# zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.1.4.win32
+ZLIB_DIR = c:\zlib-1.2.3.win32
# get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
# http://www.zlatkovic.com/libxml.en.html
############### Compiler and linker options
###########################################################
-# YAZ include&libs
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
-YAZ_DEF=/I"$(YAZ_DIR)\include"
-yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
+!if $(DEBUG)
+YAZD=yazd
+YAZPPD=yazpp_1_d
+!else
+YAZD=yaz
+YAZPPD=yazpp_1
+!endif
+
+# YAZ includes & libs
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
+YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
-$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
- copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
+# Copy yaz.dll to our bin
+yaz: $(BINDIR)\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+ copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
-# YAZ++ include&libs
-YAZPP_LIB="$(YAZPP_DIR)\lib\yazpp.lib"
+# YAZ++ includes & libs
+YAZPP_LIB="$(YAZPP_DIR)\lib\$(YAZPPD).lib"
YAZPP_DEF=/I"$(YAZPP_DIR)\include"
-yazpp: $(BINDIR)\yazpp.dll $(BINDIR)\yazpp.dll
-$(BINDIR)\yazpp.dll: $(YAZPP_DIR)\bin\yazpp.dll
- copy "$(YAZPP_DIR)\bin\yazpp.dll" $(BINDIR)
+# Copy yazpp.dll to our bin
+yazpp: $(BINDIR)\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+ copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
!if $(HAVE_ICONV)
ICONV_DEF= \
iconv: $(BINDIR)\iconv.dll
$(BINDIR)\iconv.dll:
- copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
+ copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
!else
ICONV_DEF= \
/D HAVE_ICONV_H=0
!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:
- 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=
!if $(HAVE_LIBXSLT)
LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
-libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib.dll
+libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxslt.dll:
- copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
+ copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
!else
LIBXSLT_LIB=
# (if you set things up right!)
COMMON_C_OPTIONS= \
- /nologo /W3 /GX /FD /c \
+ /nologo /W3 /EHsc /FD /c \
+ /D "_CRT_SECURE_NO_DEPRECATE" \
$(ICONV_DEF) \
$(YAZ_DEF) \
$(YAZPP_DEF) \
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
- /MDd /Od /YX /Zi /Gm
+ /MDd /Od /Zi /Gm
RELEASE_C_OPTIONS= \
/D "NDEBUG" \
/MD /O2
# /W3 = warning level
-# /GX = Enable exception handling
+# /EHsc= Enable exception handling
# /FD = Generate file dependencies (what ever they are)
# /c = compile without linking
# /FR = Generate browse info (.sbr file that gets combined into .bsc)
# /MDd = Runtime library: Multithread DLL (debug)
# /Od = Disable optimising (debug)
# /O2 = Optimize for speed
-# /YX = Automatic use of precomipled headers
# /Gm = Minimal rebuild (some cpp class stuff)
# /Zi = Program database for debuggers
# /ZI = Pgm database with special "edit&continue" stuff - not available in C5
YAZPROXY_DLL_OBJS = \
"$(OBJDIR)\yaz-proxy.obj" \
"$(OBJDIR)\yaz-proxy-config.obj" \
+ "$(OBJDIR)\yaz-usemarcon.obj" \
+ "$(OBJDIR)\msg-thread.obj" \
+ "$(OBJDIR)\charset-converter.obj" \
+ "$(OBJDIR)\limit-connect.obj" \
+ "$(OBJDIR)\modules.obj" \
"$(OBJDIR)\yaz-bw.obj"
###########################################################
###########################################################
$(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS)
- @echo Linking $(YAZPROXY_DLL)
- $(LINK) @<<
- $(LNKOPT)
- $(LINK_LIBS)
- $(DLL_LINK_OPTIONS)
- $(YAZPP_IMPLIB)
- $(YAZPROXY_DLL_OBJS)
- /out:$(YAZPROXY_DLL)
- /implib:"$(YAZPROXY_IMPLIB)"
- /map:"$(LIBDIR)\yazproxy.map"
-<<
+ $(LINK) \
+ $(LNKOPT) \
+ $(LINK_LIBS) \
+ $(DLL_LINK_OPTIONS) \
+ $(YAZPP_IMPLIB) \
+ $(YAZPROXY_DLL_OBJS) \
+ /out:$(YAZPROXY_DLL) \
+ /implib:"$(YAZPROXY_IMPLIB)" \
$(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPROXY_IMPLIB)
- @echo Linking $(YAZPROXY)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(YAZPP_IMPLIB)
- $(YAZPROXY_IMPLIB)
- $(YAZPROXY_OBJS)
- /map:"$(LIBDIR)\yazproxy.map"
+ $(LINK) \
+ $(LNKOPT) \
+ $(CLIENT_LINK_OPTIONS) \
+ $(LINK_LIBS) \
+ $(YAZPP_IMPLIB) \
+ $(YAZPROXY_IMPLIB) \
+ $(YAZPROXY_OBJS) \
/out:$(YAZPROXY)
-<<
###########################################################
############### Generated Source files
projects / yazproxy-moved-to-github.git / blobdiff