X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=2677761b821299ee691e15048ddd555d87402f20;hb=90c51614faf4ccc90065ca81abb802a6de879070;hp=1cdd6bb03cbfa8a45cbf9d13013b7f5fce9c1adf;hpb=d73649072ebd1e3595f741af51f3d34182bb03b1;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 1cdd6bb..2677761 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 2005-2006, Index Data ApS
+# Copyright (C) 2005-2007, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.24 2006-11-17 17:30:53 adam Exp $
+# $Id: makefile,v 1.34 2007-09-18 18:34:28 adam Exp $
 
 # MS NMAKE makefile for metaproxy
 
@@ -8,23 +8,23 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.7
+VERSION=1.0.11
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-BOOST=\boost
-BOOST_VERSION=1_33_1
+BOOST=\program files\boost\boost_1_34_1
+BOOST_VERSION=1_34_1
 BOOST_TOOLSET=vc80 # 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.6.28.win32
+LIBXSLT_DIR=\libxslt-1.1.19.win32
 
 # The targets
 
@@ -32,7 +32,7 @@ default: all
 
 all: dirs config yaz yazpp libxslt dll progs
 
-progs: ex_filter_frontend_net test_pipe metaproxy
+progs: metaproxy ex_filter_frontend_net test_pipe
 
 NSIS="c:\program files\nsis\makensis.exe"
 
@@ -81,11 +81,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp2d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp2
 !endif
 
 # YAZ includes & libs
@@ -94,7 +94,7 @@ YAZ_DEF=/DYAZ_HAVE_XML2=1 /DYAZ_HAVE_XSLT=1 /DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\in
 
 # 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
@@ -103,17 +103,17 @@ YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # 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
 
@@ -128,7 +128,7 @@ 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)" \
@@ -229,18 +229,22 @@ PROJECT_DLL_OBJS = \
 	$(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_load_balance.obj \
         $(OBJDIR)\filter_log.obj \
 	$(OBJDIR)\filter_multi.obj \
 	$(OBJDIR)\filter_query_rewrite.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 \
@@ -333,7 +337,6 @@ clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
-	-del $(LIBDIR)\*.MAP
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ