X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=3f9575d62ec4b0378fa5e2bc8017f1973a5f07fa;hb=df9b11da1202e8af0eb10633a44405e45c94800e;hp=7978fb1d031368b9231cae4140d2e0cfbc475964;hpb=dbe562a3c8ceaaf5133e99e1ed974acfd4acddd6;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 7978fb1..3f9575d 100644 --- a/win/makefile +++ b/win/makefile @@ -7,7 +7,7 @@ DEBUG=0 # 0 for release, 1 for debug # Metaproxy version -VERSION=1.3.55 +VERSION=1.3.56 # 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) @@ -228,6 +226,7 @@ PROJECT_DLL_OBJS = \ $(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 \ @@ -254,7 +253,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 @@ -294,15 +292,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) \