X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=263bb2d605927f1041a283adcdafe8df8f9458c6;hb=14d0e634d5061208301502d813d488d1e82f190b;hp=378db8e86c458218f4eed90d3f3bcaaf04caccd7;hpb=bdc16dc527223fb56dd0e9aac566481968db9ec6;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 378db8e..263bb2d 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.3 2005-11-08 08:56:39 adam Exp $
+# $Id: makefile,v 1.5 2005-12-10 10:07:15 adam Exp $
 
 # MS NMAKE makefile for yp2
 
@@ -27,7 +27,7 @@ default: all
 
 all: dirs config yaz yazpp libxslt dll progs
 
-progs: ex_libxml2_conf ex_filter_frontend_net test_pipe
+progs: ex_filter_frontend_net test_pipe
 
 NSIS="c:\program files\nsis\makensis.exe"
 
@@ -49,20 +49,18 @@ SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 
-###########################################################
+##########################################################
 ############### Targets - what to make
 ###########################################################
 
 PROJECT_DLL=$(BINDIR)\yp2.dll
 PROJECT_IMPLIB=$(LIBDIR)\yp2.lib
 EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe
-EX_LIBXML2_CONF=$(BINDIR)\ex_libxml2_conf.exe
 TEST_PIPE=$(BINDIR)\test_pipe.exe
 
 # shortcut names defined here
 dll: $(PROJECT_DLL)
 ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET)
-ex_libxml2_conf: $(EX_LIBXML2_CONF)
 test_pipe: $(TEST_PIPE)
 
 ###########################################################
@@ -202,17 +200,18 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\router_chain.obj \
         $(OBJDIR)\router_flexml.obj \
         $(OBJDIR)\filter.obj \
+        $(OBJDIR)\filter_backend_test.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
         $(OBJDIR)\filter_log.obj \
+	$(OBJDIR)\filter_session_shared.obj \
         $(OBJDIR)\filter_virt_db.obj \
         $(OBJDIR)\filter_z3950_client.obj \
-        $(OBJDIR)\filter_backend_test.obj \
 	$(OBJDIR)\thread_pool_observer.obj \
+	$(OBJDIR)\package.obj \
 	$(OBJDIR)\pipe.obj \
         $(OBJDIR)\util.obj 
 
 EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj
-EX_LIBXML2_CONF_OBJS = $(OBJDIR)\ex_libxml2_conf.obj
 TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
 
 ###########################################################
@@ -259,10 +258,6 @@ $(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) 
 
-$(EX_LIBXML2_CONF) : "$(BINDIR)" $(EX_LIBXML2_CONF_OBJS) $(PROJECT_DLL_OBJS)
-	@echo Linking $(EX_LIBXML2_CONF)
-	$(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_IMPLIB) $(EX_LIBXML2_CONF_OBJS) /out:$(EX_LIBXML2_CONF)
-
 $(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)