-# Copyright (C) 2005-2007, Index Data ApS
+# Copyright (C) 2005-2011 Index Data
# All rights reserved.
-# $Id: makefile,v 1.35 2007-09-19 10:29:01 adam Exp $
# MS NMAKE makefile for metaproxy
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
-VERSION=1.0.12
+VERSION=1.3.3
# YAZ and YAZ++ directories
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# Boost
-BOOST=\program files\boost\boost_1_34_1
-BOOST_VERSION=1_34_1
-BOOST_TOOLSET=vc80 # vc80 for VS 2005, vc71 for 2003
+BOOST=\program files\boost\boost_1_43
+BOOST_VERSION=1_43
+BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003
BOOST_MODEL=mt
# libxml2 + libxslt + associates
ZLIB_DIR=\zlib-1.2.3.win32
ICONV_DIR=\iconv-1.9.2.win32
-LIBXML2_DIR=\libxml2-2.6.28.win32
-LIBXSLT_DIR=\libxslt-1.1.19.win32
+LIBXML2_DIR=\libxml2-2.7.6.win32
+LIBXSLT_DIR=\libxslt-1.1.26.win32
# The targets
default: all
-all: dirs config yaz yazpp libxslt dll progs
-
-progs: metaproxy ex_filter_frontend_net test_pipe
+all: dirs config yaz yazpp libxslt progs
+progs: metaproxy ex_filter_frontend_net # test_pipe does not work
NSIS="c:\program files\nsis\makensis.exe"
nsis: all
############### Targets - what to make
###########################################################
-PROJECT_DLL=$(BINDIR)\metaproxy.dll
-PROJECT_IMPLIB=$(LIBDIR)\metaproxy.lib
EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe
METAPROXY_PROG=$(BINDIR)\metaproxy.exe
TEST_PIPE=$(BINDIR)\test_pipe.exe
# shortcut names defined here
-dll: $(PROJECT_DLL)
ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET)
metaproxy: $(METAPROXY_PROG)
test_pipe: $(TEST_PIPE)
###########################################################
!if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp2d
+YAZD=yaz4d
+YAZPPD=yazpp4d
!else
-YAZD=yaz3
-YAZPPD=yazpp2
+YAZD=yaz4
+YAZPPD=yazpp4
!endif
# YAZ includes & libs
BOOST_DEF = /I"$(BOOST)"
BOOST_LIB = \
- "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
- "$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
- "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \
- "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
-
+ "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \
+ "$(BOOST)\lib\libboost_regex-$(BOOST_LIB_SUFFIX)" \
+ "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)"
LIBXSLT_DEF = \
/I"$(ICONV_DIR)\include" \
LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
wsock32.lib advapi32.lib \
- $(BOOST_LIB) \
$(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB) \
$(BOOST_LIB)
-COMMON_LNK_OPTIONS= /nologo \
- /subsystem:windows \
- /machine:i386 \
- /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
DEBUG_LNK_OPTIONS= /debug
$(OBJDIR)\filter_cql_to_rpn.obj \
$(OBJDIR)\filter_frontend_net.obj \
$(OBJDIR)\filter_http_file.obj \
+ $(OBJDIR)\filter_limit.obj \
$(OBJDIR)\filter_load_balance.obj \
$(OBJDIR)\filter_log.obj \
$(OBJDIR)\filter_multi.obj \
$(OBJDIR)\filter_virt_db.obj \
$(OBJDIR)\filter_z3950_client.obj \
$(OBJDIR)\filter_zeerex_explain.obj \
+ $(OBJDIR)\filter_zoom.obj \
$(OBJDIR)\gduutil.obj \
$(OBJDIR)\origin.obj \
$(OBJDIR)\package.obj \
$(OBJDIR)\session.obj \
$(OBJDIR)\sru_util.obj \
$(OBJDIR)\thread_pool_observer.obj \
+ $(OBJDIR)\torus.obj \
+ $(OBJDIR)\url_recipe.obj \
$(OBJDIR)\util.obj \
$(OBJDIR)\xmlutil.obj
############### Linking
###########################################################
-$(PROJECT_DLL) $(PROJECT_IMPLIB): "$(BINDIR)" $(PROJECT_DLL_OBJS)
- $(LINK) \
- $(LNKOPT) \
- $(LINK_LIBS) \
- $(DLL_LINK_OPTIONS) \
- $(PROJECT_DLL_OBJS) \
- /out:"$(PROJECT_DLL)" \
- /implib:"$(PROJECT_IMPLIB)"
-
-$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_IMPLIB)
+$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_DLL_OBJS)
$(LINK) \
$(LNKOPT) \
$(PROG_LINK_OPTIONS) \
$(EX_FILTER_FRONTEND_NET_OBJS) \
/out:$(EX_FILTER_FRONTEND_NET)
-$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_IMPLIB)
+$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_DLL_OBJS)
$(LINK) \
$(LNKOPT) \
$(PROG_LINK_OPTIONS) \
$(LINK_LIBS) \
- $(PROJECT_DLL_OBJS) \
$(METAPROXY_OBJS) \
+ $(PROJECT_DLL_OBJS) \
/out:$(METAPROXY_PROG)
-$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB)
+$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS)
$(LINK) \
$(LNKOPT) \
$(PROG_LINK_OPTIONS) \
$(LINK_LIBS) \
- $(TEST_PIPE_OBJS) \
$(PROJECT_DLL_OBJS) \
+ $(TEST_PIPE_OBJS) \
/out:$(TEST_PIPE)
############## clean