X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=338423bda20d365284ff322d2a7e99e5d1bd4db0;hb=ddef5183e8d66d71d9ded936a0c68b947d7804e0;hp=263bb2d605927f1041a283adcdafe8df8f9458c6;hpb=e07bfa8de13353594a728ac8ae3f974067cd3485;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 263bb2d..338423b 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ # Copyright (C) 2005, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.5 2005-12-10 10:07:15 adam Exp $ +# $Id: makefile,v 1.9 2006-03-16 09:38:43 adam Exp $ # MS NMAKE makefile for yp2 @@ -27,7 +27,7 @@ default: all all: dirs config yaz yazpp libxslt dll progs -progs: ex_filter_frontend_net test_pipe +progs: ex_filter_frontend_net test_pipe yp2 NSIS="c:\program files\nsis\makensis.exe" @@ -56,11 +56,13 @@ TMP=$(TMPDIR) PROJECT_DLL=$(BINDIR)\yp2.dll PROJECT_IMPLIB=$(LIBDIR)\yp2.lib EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe +YP2_PROG=$(BINDIR)\yp2.exe TEST_PIPE=$(BINDIR)\test_pipe.exe # shortcut names defined here dll: $(PROJECT_DLL) ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET) +yp2: $(YP2_PROG) test_pipe: $(TEST_PIPE) ########################################################### @@ -196,22 +198,32 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) ########################################################### PROJECT_DLL_OBJS = \ - $(OBJDIR)\session.obj \ - $(OBJDIR)\router_chain.obj \ - $(OBJDIR)\router_flexml.obj \ + $(OBJDIR)\factory_filter.obj \ + $(OBJDIR)\factory_static.obj \ $(OBJDIR)\filter.obj \ + $(OBJDIR)\filter_auth_simple.obj \ $(OBJDIR)\filter_backend_test.obj \ $(OBJDIR)\filter_frontend_net.obj \ + $(OBJDIR)\filter_http_file.obj \ $(OBJDIR)\filter_log.obj \ - $(OBJDIR)\filter_session_shared.obj \ + $(OBJDIR)\filter_multi.obj \ + $(OBJDIR)\filter_query_rewrite.obj \ + $(OBJDIR)\filter_session_shared.obj \ + $(OBJDIR)\filter_template.obj \ $(OBJDIR)\filter_virt_db.obj \ $(OBJDIR)\filter_z3950_client.obj \ - $(OBJDIR)\thread_pool_observer.obj \ $(OBJDIR)\package.obj \ $(OBJDIR)\pipe.obj \ - $(OBJDIR)\util.obj + $(OBJDIR)\plainfile.obj \ + $(OBJDIR)\router_chain.obj \ + $(OBJDIR)\router_flexml.obj \ + $(OBJDIR)\session.obj \ + $(OBJDIR)\thread_pool_observer.obj \ + $(OBJDIR)\util.obj \ + $(OBJDIR)\xmlutil.obj EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj +YP2_OBJS = $(OBJDIR)\yp2_prog.obj TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj ########################################################### @@ -258,6 +270,10 @@ $(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT @echo Linking $(EX_FILTER_FRONTEND_NET) $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(EX_FILTER_FRONTEND_NET_OBJS) /out:$(EX_FILTER_FRONTEND_NET) +$(YP2_PROG) : "$(BINDIR)" $(YP2_OBJS) $(PROJECT_IMPLIB) + @echo Linking $(YP2_PROG) + $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(YP2_OBJS) /out:$(YP2_PROG) + $(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB) @echo Linking $(TEST_PIPE) $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS) /out:$(TEST_PIPE)