Version 1.0.23. Bump copyright year.

[metaproxy-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index ef8eaf4..cacfd7f 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,5 @@
-# Copyright (C) 2005-2007, Index Data ApS
+# Copyright (C) 2005-2010, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.30 2007-01-25 18:49:26 adam Exp $
 
 # MS NMAKE makefile for metaproxy
 
@@ -8,32 +7,31 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.9
+VERSION=1.0.23
 
 # 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_35_0
+BOOST_VERSION=1_35
+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
@@ -64,14 +62,11 @@ TMP=$(TMPDIR)
 ############### 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)
@@ -81,11 +76,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp3d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp3
 !endif
 
 # YAZ includes & libs
@@ -128,12 +123,13 @@ BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-gd-$(BOOST_VERSION).lib
 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 = \
@@ -232,6 +228,7 @@ PROJECT_DLL_OBJS = \
         $(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 \
@@ -296,16 +293,7 @@ $(PROJECT_RES): $(PROJECT_RC)
 ############### 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) \
@@ -314,22 +302,22 @@ $(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT
                $(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