X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=6ee09eedd1f8159ef2f54d15eb864390874bc3f8;hb=ce58475443545004d93a621420aa554be839268c;hp=7faefea2cd90f7adb3b499ce2629bd5006d22b3e;hpb=7f5ca4e0e34d88dcdd307865181195e1fa89e7b0;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 7faefea..6ee09ee 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.21 2006-08-30 13:18:44 adam Exp $ +# $Id: makefile,v 1.29 2007-01-25 18:20:09 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.8 # YAZ and YAZ++ directories YAZ_DIR=..\..\yaz @@ -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,23 +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)\origin.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 @@ -330,7 +337,6 @@ clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(TMPDIR)\*. - -del $(LIBDIR)\*.MAP -del $(LIBDIR)\*.LIB -del $(OBJDIR)\*.OBJ