X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=d88ebc502aa59ffe4dff872f3d6ad15eb9366ac0;hb=99592aa50f9ebdf033ddf3c576a34c6a12f81324;hp=3954bfc34ed0a4e73eabc67d66c35292ddd2943e;hpb=31ab5dfd9f2816f02a5da7abfc3fc152e45e0f17;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 3954bfc..d88ebc5 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,5 @@
-# Copyright (C) 2005-2006, Index Data ApS
+# Copyright (C) 2005-2012 Index Data
 # All rights reserved.
-# $Id: makefile,v 1.20 2006-08-30 12:30:02 adam Exp $
 
 # MS NMAKE makefile for metaproxy
 
@@ -8,32 +7,31 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.6
+VERSION=1.3.33
 
 # 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_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.1.win32
-LIBXML2_DIR=\libxml2-2.6.20.win32
-LIBXSLT_DIR=\libxslt-1.1.14.win32
+ICONV_DIR=\iconv-1.9.2.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=yaz4d
+YAZPPD=yazpp4d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz4
+YAZPPD=yazpp4
 !endif
 
 # YAZ includes & libs
@@ -94,7 +89,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 +98,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,13 +123,11 @@ 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_regex-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" 
 
 LIBXSLT_DEF = \
 	      /I"$(ICONV_DIR)\include" \
@@ -190,14 +183,10 @@ LINK=link.exe
 
 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 
 
@@ -228,15 +217,25 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter.obj \
 	$(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_record_transform.obj \
         $(OBJDIR)\filter_session_shared.obj \
+        $(OBJDIR)\filter_sort.obj \
+        $(OBJDIR)\filter_sru_to_z3950.obj \
         $(OBJDIR)\filter_template.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)\pipe.obj \
@@ -244,7 +243,10 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\router_chain.obj \
         $(OBJDIR)\router_flexml.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 
 
@@ -288,16 +290,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) \
@@ -306,22 +299,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
@@ -329,7 +322,6 @@ clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
-	-del $(LIBDIR)\*.MAP
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ