Include test-config5

[metaproxy-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 238fe39..934f34e 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,8 +1,8 @@
-# Copyright (C) 2005, Index Data ApS
+# Copyright (C) 2005-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.1 2005-11-03 14:45:16 adam Exp $
+# $Id: makefile,v 1.10 2006-03-16 10:45:28 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
@@ -27,12 +27,12 @@ default: all
 
 all: dirs config yaz yazpp libxslt dll progs
 
-progs: ex_libxml2_conf
+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
@@ -49,19 +49,21 @@ 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
+PROJECT_DLL=$(BINDIR)\metaproxy.dll
+PROJECT_IMPLIB=$(LIBDIR)\metaproxy.lib
 EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe
-EX_LIBXML2_CONF=$(BINDIR)\ex_libxml2_conf.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)
-ex_libxml2_conf: $(EX_LIBXML2_CONF)
+metaproxy: $(METAPROXY_PROG)
+test_pipe: $(TEST_PIPE)
 
 ###########################################################
 ############### Compiler and linker options 
@@ -104,7 +106,8 @@ BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOSTVER)"
 BOOST_LIB = \
     "$(BOOST)\lib\libboost_date_time-vc71-mt-$(BOOSTVER).lib" \
     "$(BOOST)\lib\libboost_program_options-vc71-mt-$(BOOSTVER).lib" \
-    "$(BOOST)\lib\libboost_thread-vc71-mt-$(BOOSTVER).lib"
+    "$(BOOST)\lib\libboost_thread-vc71-mt-$(BOOSTVER).lib" \
+    "$(BOOST)\lib\libboost_unit_test_framework-vc71-mt-$(BOOSTVER).lib" 
 
 
 LIBXSLT_DEF = \
@@ -125,7 +128,6 @@ COMMON_C_OPTIONS=          \
   $(LIBXSLT_DEF)          \
   /D "_WINDOWS"            \
   /D "WIN32"               \
-  /D "HAVE_WCHAR_H=1"      \
   /EHsc \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
@@ -164,7 +166,8 @@ LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
           $(BOOST_LIB) \
-           $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB)
+           $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB) \
+          $(BOOST_LIB) 
 
 COMMON_LNK_OPTIONS= /nologo \
                   /subsystem:windows \
@@ -195,22 +198,33 @@ 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_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)\filter_backend_test.obj \
-        $(OBJDIR)\util.obj
-
-# $(OBJDIR)\thread_pool_observer.obj 
-#$(OBJDIR)\filter_frontend_net.obj \
-
+       $(OBJDIR)\package.obj \
+       $(OBJDIR)\pipe.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
-EX_LIBXML2_CONF_OBJS = $(OBJDIR)\ex_libxml2_conf.obj
+METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj
+TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
 
 ###########################################################
 ############### Compiling 
@@ -232,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
@@ -250,37 +264,19 @@ $(PROJECT_RES): $(PROJECT_RC)
 
 $(PROJECT_DLL) $(PROJECT_IMPLIB): "$(BINDIR)" $(PROJECT_DLL_OBJS)
        @echo Linking $(PROJECT_DLL)
-       $(LINK) @<<
-               $(LNKOPT) 
-               $(LINK_LIBS) 
-               $(DLL_LINK_OPTIONS)
-               $(PROJECT_DLL_OBJS)
-               /out:"$(PROJECT_DLL)"
-               /implib:"$(PROJECT_IMPLIB)"
-<<
-
-$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_OBJS) $(PROJECT_IMPLIB)
+       $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS) $(PROJECT_DLL_OBJS) /out:"$(PROJECT_DLL)" /implib:"$(PROJECT_IMPLIB)"
+
+$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_IMPLIB)
        @echo Linking $(EX_FILTER_FRONTEND_NET)
-       $(LINK) @<<
-        $(LNKOPT) 
-               $(PROG_LINK_OPTIONS)
-               $(LINK_LIBS) 
-               $(PROJECT_IMPLIB)
-               $(EX_FILTER_FRONTEND_NET_OBJS)
-               /out:$(EX_FILTER_FRONTEND_NET)
-<<
-
-$(EX_LIBXML2_CONF) : "$(BINDIR)" $(EX_LIBXML2_CONF_OBJS) $(PROJECT_IMPLIB)
-       @echo Linking $(EX_LIBXML2_CONF)
-       $(LINK) @<<
-        $(LNKOPT) 
-               $(PROG_LINK_OPTIONS)
-               $(LINK_LIBS) 
-               $(PROJECT_IMPLIB)
-               $(EX_LIBXML2_CONF_OBJS)
-               /out:$(EX_LIBXML2_CONF)
-<<
+       $(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_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)
+       $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS) /out:$(TEST_PIPE)
 
 ############## clean
 clean: