X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e78b8c76ee792807408e199e3ccbc49abe3a4631;hb=9ef76818affd5f828e28e83d473b2308b6ca46d2;hp=5f3105125fddd5183b144200441ced2c7261fdc5;hpb=ccbce944e7a7118c348b3bb70d7c175cb5819c32;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 5f31051..e78b8c7 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012 Index Data
+# Copyright (C) 2005-2013 Index Data
 # All rights reserved.
 
 # MS NMAKE makefile for metaproxy
@@ -7,7 +7,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.50
+VERSION=1.4.0
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
@@ -31,7 +31,7 @@ default: all
 
 all: dirs config yaz yazpp libxslt progs
 
-progs: metaproxy ex_filter_frontend_net # test_pipe does not work
+progs: metaproxy # test_pipe does not work
 NSIS="c:\program files\nsis\makensis.exe"
 
 nsis: all
@@ -62,12 +62,10 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-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
-ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET)
 metaproxy: $(METAPROXY_PROG)
 test_pipe: $(TEST_PIPE)
 
@@ -76,11 +74,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yaz4d
-YAZPPD=yazpp5d
+YAZD=yaz5d
+YAZPPD=yazpp6d
 !else
-YAZD=yaz4
-YAZPPD=yazpp5
+YAZD=yaz5
+YAZPPD=yazpp6
 !endif
 
 # YAZ includes & libs
@@ -221,13 +219,18 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_bounce.obj \
         $(OBJDIR)\filter_cql_to_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
+	$(OBJDIR)\filter_http_client.obj \
 	$(OBJDIR)\filter_http_file.obj \
+	$(OBJDIR)\filter_http_rewrite.obj \
+	$(OBJDIR)\filter_http_rewrite1.obj \
         $(OBJDIR)\filter_limit.obj \
         $(OBJDIR)\filter_load_balance.obj \
         $(OBJDIR)\filter_log.obj \
 	$(OBJDIR)\filter_multi.obj \
+	$(OBJDIR)\filter_present_chunk.obj \
 	$(OBJDIR)\filter_query_rewrite.obj \
         $(OBJDIR)\filter_record_transform.obj \
+        $(OBJDIR)\filter_sd_remove.obj \
         $(OBJDIR)\filter_session_shared.obj \
         $(OBJDIR)\filter_sort.obj \
         $(OBJDIR)\filter_sru_to_z3950.obj \
@@ -237,12 +240,14 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_zeerex_explain.obj \
         $(OBJDIR)\filter_zoom.obj \
 	$(OBJDIR)\gduutil.obj \
+	$(OBJDIR)\html_parser.obj \
 	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \
 	$(OBJDIR)\pipe.obj \
 	$(OBJDIR)\plainfile.obj \
         $(OBJDIR)\router_chain.obj \
         $(OBJDIR)\router_flexml.obj \
+        $(OBJDIR)\router_xml.obj \
         $(OBJDIR)\session.obj \
         $(OBJDIR)\sru_util.obj \
 	$(OBJDIR)\thread_pool_observer.obj \
@@ -251,7 +256,6 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\util.obj \
         $(OBJDIR)\xmlutil.obj 
 
-EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj
 METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj
 TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
 
@@ -291,15 +295,6 @@ $(PROJECT_RES): $(PROJECT_RC)
 ############### Linking
 ###########################################################
 
-$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_DLL_OBJS)
-	$(LINK) \
-		$(LNKOPT) \
-		$(PROG_LINK_OPTIONS) \
-		$(LINK_LIBS) \
-		$(PROJECT_DLL_OBJS) \
-		$(EX_FILTER_FRONTEND_NET_OBJS) \
-		/out:$(EX_FILTER_FRONTEND_NET) 
-
 $(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_DLL_OBJS)
 	$(LINK) \
 		$(LNKOPT) \