X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=14d773459101a2a9a27f9e67e5ecbaab3a5a08e8;hb=9428c36b40c407c719537cd6ee6db0443c8595dd;hp=b136a27f8deb902bd635969ab4508f4a65b80afb;hpb=0ecaab9cf2fd03df7bd25cff1f95470a03aff404;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index b136a27..14d7734 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,15 +1,15 @@
-# Copyright (C) 2005, Index Data ApS
+# Copyright (C) 2005-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.8 2006-02-02 11:34:15 adam Exp $
+# $Id: makefile,v 1.11 2006-03-30 12:52:33 adam Exp $
 
-# MS NMAKE makefile for yp2
+# MS NMAKE makefile for metaproxy
 
 # Parameters that we customize often.
 DEBUG=0   # 0 for release, 1 for debug
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
-YAZPP_DIR=..\..\yaz++
+YAZPP_DIR=..\..\yazpp
 
 # Boost
 BOOST=\boost
@@ -27,12 +27,12 @@ default: all
 
 all: dirs config yaz yazpp libxslt dll progs
 
-progs: ex_filter_frontend_net test_pipe yp2
+progs: ex_filter_frontend_net test_pipe metaproxy
 
 NSIS="c:\program files\nsis\makensis.exe"
 
 nsis: all
-	$(NSIS) yp2.nsi
+	$(NSIS) metaproxy.nsi
 
 # Directories
 # The current directory is supposed to be something like
@@ -53,16 +53,16 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-PROJECT_DLL=$(BINDIR)\yp2.dll
-PROJECT_IMPLIB=$(LIBDIR)\yp2.lib
+PROJECT_DLL=$(BINDIR)\metaproxy.dll
+PROJECT_IMPLIB=$(LIBDIR)\metaproxy.lib
 EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe
-YP2_PROG=$(BINDIR)\yp2.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)
-yp2: $(YP2_PROG)
+metaproxy: $(METAPROXY_PROG)
 test_pipe: $(TEST_PIPE)
 
 ###########################################################
@@ -207,6 +207,7 @@ PROJECT_DLL_OBJS = \
 	$(OBJDIR)\filter_http_file.obj \
         $(OBJDIR)\filter_log.obj \
 	$(OBJDIR)\filter_multi.obj \
+	$(OBJDIR)\filter_query_rewrite.obj \
         $(OBJDIR)\filter_session_shared.obj \
         $(OBJDIR)\filter_template.obj \
         $(OBJDIR)\filter_virt_db.obj \
@@ -222,7 +223,7 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\xmlutil.obj 
 
 EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj
-YP2_OBJS = $(OBJDIR)\yp2_prog.obj
+METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj
 TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
 
 ###########################################################
@@ -245,8 +246,8 @@ COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)"
 DEBUG_RC_OPTIONS=/d "_DEBUG"
 RELEASE_RC_OPTIONS=/d "NDEBUG"
 
-PROJECT_RES=$(OBJDIR)\yp2.res
-PROJECT_RC=$(WINDIR)\yp2.rc
+PROJECT_RES=$(OBJDIR)\metaproxy.res
+PROJECT_RC=$(WINDIR)\metaproxy.rc
 
 !if $(DEBUG)
 RSOPT=/d_DEBUG
@@ -269,9 +270,9 @@ $(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) 
+$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_IMPLIB)
+	@echo Linking $(METAPROXY_PROG)
+	$(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(METAPROXY_OBJS) /out:$(METAPROXY_PROG) 
 
 $(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB)
 	@echo Linking $(TEST_PIPE)