X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=42f08167639ffe12444647225da3e5919bbb8d1a;hb=f65a8ab3ce74cd94d3184ac4e0e94f5b55151fcf;hp=80509c08bce129bf65fef1e9abffe6fcd29c0211;hpb=908dd86d9f790d2345b03da2b5f37f307fcc0c8a;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 80509c0..42f0816 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,19 +1,24 @@
-# Copyright (C) 2005, Index Data ApS
+# Copyright (C) 2005-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.4 2005-11-23 14:48:44 adam Exp $
+# $Id: makefile,v 1.14 2006-04-30 08:59:44 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
 
+# Metaproxy version
+VERSION=1.0.2
+
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
-YAZPP_DIR=..\..\yaz++
+YAZPP_DIR=..\..\yazpp
 
 # Boost
 BOOST=\boost
-BOOSTVER=1_33
+BOOST_VERSION=1_33_1
+BOOST_TOOLSET=vc80 # vc80 for VS 2005, vc71 for 2003
+BOOST_MODEL=mt
 
 # libxml2 + libxslt + associates
 ZLIB_DIR=\zlib-1.2.3.win32
@@ -27,12 +32,12 @@ 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 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,49 +54,59 @@ 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 
 ###########################################################
 
+!if $(DEBUG)
+YAZD=yazd
+YAZPPD=yazppd
+!else
+YAZD=yaz
+YAZPPD=yazpp
+!endif
+
 # YAZ includes & libs
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
 YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
 
 # Copy yaz.dll to our bin
-yaz: $(BINDIR)\yaz.dll
-$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
-  copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
+yaz: $(BINDIR)\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+  copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # YAZ++ includes & libs
-YAZPP_LIB="$(YAZPP_DIR)\lib\yazpp.lib"
+YAZPP_LIB="$(YAZPP_DIR)\lib\$(YAZPPD).lib"
 YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # Copy yazpp.dll to our bin
-yazpp: $(BINDIR)\yazpp.dll
-$(BINDIR)\yazpp.dll: $(YAZPP_DIR)\bin\yazpp.dll
-  copy "$(YAZPP_DIR)\bin\yazpp.dll" $(BINDIR)
+yazpp: $(BINDIR)\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+  copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
 
 # Copy libxslt and associates to our bin directory
 libxslt: $(BINDIR)\libxslt.dll
 
 $(BINDIR)\libxslt.dll: $(LIBXSLT_DIR)\bin\libxslt.dll
 	copy $(ICONV_DIR)\bin\iconv.dll $(BINDIR)
+	copy $(ZLIB_DIR)\bin\zlib1.dll $(BINDIR)
 	copy $(LIBXML2_DIR)\bin\libxml2.dll $(BINDIR)
 	copy $(LIBXSLT_DIR)\bin\libxslt.dll $(BINDIR)
 
@@ -102,12 +117,18 @@ $(SRCDIR)\config.hpp:
 
 # Boost 
 #
-BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOSTVER)"
+!if $(DEBUG)
+BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-gd-$(BOOST_VERSION).lib
+!else
+BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
+!endif
+
+BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOST_VERSION)"
 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_unit_test_framework-vc71-mt-$(BOOSTVER).lib" 
+    "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
 
 
 LIBXSLT_DEF = \
@@ -121,14 +142,14 @@ LIBXSLT_LIB = \
     "$(LIBXSLT_DIR)\lib\libxslt.lib"
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c \
   $(YAZ_DEF)               \
   $(YAZPP_DEF)             \
   $(BOOST_DEF)             \
   $(LIBXSLT_DEF)	   \
+  /D VERSION=\"$(VERSION)\" \
   /D "_WINDOWS"            \
   /D "WIN32"               \
-  /EHsc \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 	   \
@@ -136,7 +157,7 @@ COMMON_C_OPTIONS=          \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /MDd  /Od /Zi /Gm
 
 RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
@@ -153,7 +174,6 @@ RELEASE_C_OPTIONS=  \
 # /MDd = Runtime library: Multithread DLL (debug)
 # /Od  = Disable optimising (debug)
 # /O2  = Optimize for speed
-# /YX  = Automatic use of precomipled headers
 # /Gm  = Minimal rebuild (some cpp class stuff)
 # /Zi  = Program database for debuggers
 # /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
@@ -198,23 +218,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
-EX_LIBXML2_CONF_OBJS = $(OBJDIR)\ex_libxml2_conf.obj
+METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj
 TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
 
 ###########################################################
@@ -237,8 +266,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
@@ -261,9 +290,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) 
 
-$(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)
+$(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)