-# Copyright (C) 2005-2006, Index Data ApS
+# Copyright (C) 2005-2010, Index Data
# All rights reserved.
-# $Id: makefile,v 1.25 2006-11-17 17:58:07 adam Exp $
# MS NMAKE makefile for metaproxy
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
-VERSION=1.0.7
+VERSION=1.1.7
# YAZ and YAZ++ directories
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# Boost
-BOOST=\boost
-BOOST_VERSION=1_33_1
-BOOST_TOOLSET=vc80 # vc80 for VS 2005, vc71 for 2003
+BOOST=\program files\boost\boost_1_40
+BOOST_VERSION=1_40
+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.26.win32
-LIBXSLT_DIR=\libxslt-1.1.17.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: ex_filter_frontend_net test_pipe metaproxy
+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=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz4d
+YAZPPD=yazpp4d
!else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz4
+YAZPPD=yazpp4
!endif
# YAZ includes & libs
# Copy yaz.dll to our bin
yaz: $(BINDIR)\$(YAZD).dll
-$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll"
copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
# YAZ++ includes & libs
# Copy yazpp.dll to our bin
yazpp: $(BINDIR)\$(YAZPPD).dll
-$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll"
copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
# Copy libxslt and associates to our bin directory
libxslt: $(BINDIR)\libxslt.dll
-$(BINDIR)\libxslt.dll: $(LIBXSLT_DIR)\bin\libxslt.dll
- copy $(ICONV_DIR)\bin\iconv.dll $(BINDIR)
- copy $(ZLIB_DIR)\bin\zlib1.dll $(BINDIR)
- copy $(LIBXML2_DIR)\bin\libxml2.dll $(BINDIR)
- copy $(LIBXSLT_DIR)\bin\libxslt.dll $(BINDIR)
+$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\bin\libxslt.dll"
+ copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
+ copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
+ copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
+ copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
config: $(SRCDIR)\config.hpp
BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
!endif
-BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOST_VERSION)"
+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_program_options-$(BOOST_LIB_SUFFIX)" \
+# "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
LIBXSLT_DEF = \
$(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_auth_simple.obj \
$(OBJDIR)\filter_backend_test.obj \
$(OBJDIR)\filter_bounce.obj \
+ $(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_query_rewrite.obj \
- $(OBJDIR)\filter_session_shared.obj \
$(OBJDIR)\filter_record_transform.obj \
+ $(OBJDIR)\filter_session_shared.obj \
$(OBJDIR)\filter_sru_to_z3950.obj \
$(OBJDIR)\filter_template.obj \
$(OBJDIR)\filter_virt_db.obj \
$(OBJDIR)\filter_z3950_client.obj \
- $(OBJDIR)\origin.obj \
+ $(OBJDIR)\filter_zeerex_explain.obj \
$(OBJDIR)\gduutil.obj \
+ $(OBJDIR)\origin.obj \
$(OBJDIR)\package.obj \
$(OBJDIR)\pipe.obj \
$(OBJDIR)\plainfile.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