X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=be2ef5f868a76edaa7979c7f5a64064fdf923a19;hb=bb050094eaf8f0a8223a3bd2e9973d8d2e993154;hp=350e260f4b62ae57ef1cfe826e0230dbcfc9dddf;hpb=4f255e4396867c12c79da88ac82e93daac6b4cc4;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 350e260..be2ef5f 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 2005-2006, Index Data ApS
+# Copyright (C) 2005-2007, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.19 2006-07-07 07:10:00 adam Exp $
+# $Id: makefile,v 1.31 2007-05-09 08:23:48 adam Exp $
 
 # MS NMAKE makefile for metaproxy
 
@@ -8,7 +8,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.6
+VERSION=1.0.9
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
@@ -22,9 +22,9 @@ BOOST_MODEL=mt
 
 # libxml2 + libxslt + associates
 ZLIB_DIR=\zlib-1.2.3.win32
-ICONV_DIR=\iconv-1.9.1.win32
-LIBXML2_DIR=\libxml2-2.6.20.win32
-LIBXSLT_DIR=\libxslt-1.1.14.win32
+ICONV_DIR=\iconv-1.9.2.win32
+LIBXML2_DIR=\libxml2-2.6.26.win32
+LIBXSLT_DIR=\libxslt-1.1.17.win32
 
 # The targets
 
@@ -81,11 +81,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp2d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp2
 !endif
 
 # YAZ includes & libs
@@ -94,7 +94,7 @@ YAZ_DEF=/DYAZ_HAVE_XML2=1 /DYAZ_HAVE_XSLT=1 /DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\in
 
 # Copy yaz.dll to our bin
 yaz: $(BINDIR)\$(YAZD).dll
-$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll"
   copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # YAZ++ includes & libs
@@ -103,17 +103,17 @@ YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # Copy yazpp.dll to our bin
 yazpp: $(BINDIR)\$(YAZPPD).dll
-$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(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)
+$(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)
 
 config: $(SRCDIR)\config.hpp
 
@@ -228,21 +228,30 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter.obj \
 	$(OBJDIR)\filter_auth_simple.obj \
         $(OBJDIR)\filter_backend_test.obj \
+        $(OBJDIR)\filter_bounce.obj \
+        $(OBJDIR)\filter_cql_to_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
 	$(OBJDIR)\filter_http_file.obj \
+        $(OBJDIR)\filter_load_balance.obj \
         $(OBJDIR)\filter_log.obj \
 	$(OBJDIR)\filter_multi.obj \
 	$(OBJDIR)\filter_query_rewrite.obj \
+        $(OBJDIR)\filter_record_transform.obj \
         $(OBJDIR)\filter_session_shared.obj \
+        $(OBJDIR)\filter_sru_to_z3950.obj \
         $(OBJDIR)\filter_template.obj \
         $(OBJDIR)\filter_virt_db.obj \
         $(OBJDIR)\filter_z3950_client.obj \
+        $(OBJDIR)\filter_zeerex_explain.obj \
+	$(OBJDIR)\gduutil.obj \
+	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \
 	$(OBJDIR)\pipe.obj \
 	$(OBJDIR)\plainfile.obj \
         $(OBJDIR)\router_chain.obj \
         $(OBJDIR)\router_flexml.obj \
         $(OBJDIR)\session.obj \
+        $(OBJDIR)\sru_util.obj \
 	$(OBJDIR)\thread_pool_observer.obj \
         $(OBJDIR)\util.obj \
         $(OBJDIR)\xmlutil.obj 
@@ -328,7 +337,6 @@ clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
-	-del $(LIBDIR)\*.MAP
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ