diff --git a/Makefile.in b/Makefile.in
index 4431438c99..19b5ab09c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -107,6 +107,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -288,9 +289,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -344,9 +351,11 @@ distdir: $(DISTFILES)
 	mkdir $(distdir)
 	$(mkinstalldirs) $(distdir)/py $(distdir)/test
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -410,13 +419,12 @@ distcheck: dist
 	$(am__remove_distdir)
 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && $(mkinstalldirs) $$dc_destdir \
-	  && cd $(distdir)/=build \
+	  && cd $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -428,7 +436,9 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
-	  && ({   $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	  && ({ \
+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
@@ -441,7 +451,7 @@ distcheck: dist
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
 distuninstallcheck:
-	cd $(distuninstallcheck_dir) \
+	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -450,11 +460,11 @@ distuninstallcheck:
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
@@ -516,7 +526,7 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+	-rm -rf $(top_srcdir)/autom4te.cache
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
diff --git a/aclocal.m4 b/aclocal.m4
index 626f4e3e19..7251783569 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -16,7 +16,7 @@
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -34,14 +34,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
+# serial 10
 
 AC_PREREQ([2.54])
 
@@ -86,8 +79,8 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
@@ -108,6 +101,7 @@ AM_PROG_INSTALL_STRIP
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
@@ -130,7 +124,16 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # loop where config.status creates the headers, so we can generate
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
 # Copyright 2002  Free Software Foundation, Inc.
@@ -160,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7])])
+	 [AM_AUTOMAKE_VERSION([1.7.6])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -446,9 +449,42 @@ fi
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# serial 4						-*- Autoconf -*-
+#                                                          -*- Autoconf -*-
+# Copyright (C) 2003  Free Software Foundation, Inc.
 
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# serial 5						-*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -509,18 +545,32 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -538,13 +588,20 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -566,16 +623,8 @@ AM_CONDITIONAL([am__fastdep$1], [
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 ])
 
 
@@ -679,7 +728,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Check to see how 'make' treats includes.	-*- Autoconf -*-
 
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -704,8 +753,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
@@ -733,9 +783,9 @@ if test "$am__include" = "#"; then
       _am_result=BSD
    fi
 fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
diff --git a/api/Makefile.in b/api/Makefile.in
index 58558a1415..ffc0b43aaa 100644
--- a/api/Makefile.in
+++ b/api/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -194,6 +195,7 @@ EXTRA_PROGRAMS = api_app api_test
 api_app_SOURCES = api_app.C mfile.C boinc_api.C ../lib/parse.C
 api_test_SOURCES = boinc_api.C api_test.C ../lib/parse.C
 subdir = api
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -258,10 +260,6 @@ AR = ar
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-util.$(OBJEXT): ../lib/util.C
-shmem.$(OBJEXT): ../lib/shmem.C
-parse.$(OBJEXT): ../lib/parse.C
-app_ipc.$(OBJEXT): ../lib/app_ipc.C
 libboinc_api.a: $(libboinc_api_a_OBJECTS) $(libboinc_api_a_DEPENDENCIES) 
 	-rm -f libboinc_api.a
 	$(libboinc_api_a_AR) libboinc_api.a $(libboinc_api_a_OBJECTS) $(libboinc_api_a_LIBADD)
@@ -298,7 +296,7 @@ distclean-depend:
 .C.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -308,19 +306,19 @@ distclean-depend:
 
 .C.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 util.o: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.o -MD -MP -MF "$(DEPDIR)/util.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o util.o `test -f '../lib/util.C' || echo '$(srcdir)/'`../lib/util.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.o' libtool=no @AMDEPBACKSLASH@
@@ -330,19 +328,19 @@ util.o: ../lib/util.C
 
 util.obj: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.obj -MD -MP -MF "$(DEPDIR)/util.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/util.Po' tmpdepfile='$(DEPDIR)/util.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`
 
 shmem.o: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shmem.o -MD -MP -MF "$(DEPDIR)/shmem.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o shmem.o `test -f '../lib/shmem.C' || echo '$(srcdir)/'`../lib/shmem.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='shmem.o' libtool=no @AMDEPBACKSLASH@
@@ -352,19 +350,19 @@ shmem.o: ../lib/shmem.C
 
 shmem.obj: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shmem.obj -MD -MP -MF "$(DEPDIR)/shmem.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='shmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/shmem.Po' tmpdepfile='$(DEPDIR)/shmem.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`
 
 parse.o: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.o -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o parse.o `test -f '../lib/parse.C' || echo '$(srcdir)/'`../lib/parse.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.o' libtool=no @AMDEPBACKSLASH@
@@ -374,19 +372,19 @@ parse.o: ../lib/parse.C
 
 parse.obj: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.obj -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/parse.Po' tmpdepfile='$(DEPDIR)/parse.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`
 
 app_ipc.o: ../lib/app_ipc.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT app_ipc.o -MD -MP -MF "$(DEPDIR)/app_ipc.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o app_ipc.o `test -f '../lib/app_ipc.C' || echo '$(srcdir)/'`../lib/app_ipc.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/app_ipc.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/app_ipc.C' object='app_ipc.o' libtool=no @AMDEPBACKSLASH@
@@ -396,14 +394,14 @@ app_ipc.o: ../lib/app_ipc.C
 
 app_ipc.obj: ../lib/app_ipc.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT app_ipc.obj -MD -MP -MF "$(DEPDIR)/app_ipc.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/app_ipc.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/app_ipc.C' object='app_ipc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/app_ipc.Po' tmpdepfile='$(DEPDIR)/app_ipc.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -465,11 +463,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -495,7 +495,6 @@ check: check-am
 all-am: Makefile $(LIBRARIES)
 
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 1a7e966070..8eecca76f5 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -185,6 +186,7 @@ upper_case_SOURCES = upper_case.C ../api/boinc_api.C
 concat_SOURCES = concat.C ../api/boinc_api.C
 1sec_SOURCES = 1sec.C ../api/boinc_api.C
 subdir = apps
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -246,12 +248,6 @@ AR = ar
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-mfile.$(OBJEXT): ../api/mfile.C
-parse.$(OBJEXT): ../lib/parse.C
-filesys.$(OBJEXT): ../lib/filesys.C
-shmem.$(OBJEXT): ../lib/shmem.C
-util.$(OBJEXT): ../lib/util.C
-app_ipc.$(OBJEXT): ../lib/app_ipc.C
 libapp.a: $(libapp_a_OBJECTS) $(libapp_a_DEPENDENCIES) 
 	-rm -f libapp.a
 	$(libapp_a_AR) libapp.a $(libapp_a_OBJECTS) $(libapp_a_LIBADD)
@@ -280,7 +276,6 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-boinc_api.$(OBJEXT): ../api/boinc_api.C
 1sec$(EXEEXT): $(1sec_OBJECTS) $(1sec_DEPENDENCIES) 
 	@rm -f 1sec$(EXEEXT)
 	$(CXXLINK) $(1sec_LDFLAGS) $(1sec_OBJECTS) $(1sec_LDADD) $(LIBS)
@@ -314,7 +309,7 @@ distclean-depend:
 .C.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -324,19 +319,19 @@ distclean-depend:
 
 .C.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 mfile.o: ../api/mfile.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mfile.o -MD -MP -MF "$(DEPDIR)/mfile.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o mfile.o `test -f '../api/mfile.C' || echo '$(srcdir)/'`../api/mfile.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/mfile.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/mfile.C' object='mfile.o' libtool=no @AMDEPBACKSLASH@
@@ -346,19 +341,19 @@ mfile.o: ../api/mfile.C
 
 mfile.obj: ../api/mfile.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mfile.obj -MD -MP -MF "$(DEPDIR)/mfile.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/mfile.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/mfile.C' object='mfile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/mfile.Po' tmpdepfile='$(DEPDIR)/mfile.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'; fi`
 
 parse.o: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.o -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o parse.o `test -f '../lib/parse.C' || echo '$(srcdir)/'`../lib/parse.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.o' libtool=no @AMDEPBACKSLASH@
@@ -368,19 +363,19 @@ parse.o: ../lib/parse.C
 
 parse.obj: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.obj -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/parse.Po' tmpdepfile='$(DEPDIR)/parse.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`
 
 filesys.o: ../lib/filesys.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesys.o -MD -MP -MF "$(DEPDIR)/filesys.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o filesys.o `test -f '../lib/filesys.C' || echo '$(srcdir)/'`../lib/filesys.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/filesys.Tpo" "$(DEPDIR)/filesys.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesys.Tpo" "$(DEPDIR)/filesys.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/filesys.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/filesys.C' object='filesys.o' libtool=no @AMDEPBACKSLASH@
@@ -390,19 +385,19 @@ filesys.o: ../lib/filesys.C
 
 filesys.obj: ../lib/filesys.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesys.obj -MD -MP -MF "$(DEPDIR)/filesys.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/filesys.Tpo" "$(DEPDIR)/filesys.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesys.Tpo" "$(DEPDIR)/filesys.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/filesys.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/filesys.C' object='filesys.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesys.Po' tmpdepfile='$(DEPDIR)/filesys.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'; fi`
 
 shmem.o: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shmem.o -MD -MP -MF "$(DEPDIR)/shmem.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o shmem.o `test -f '../lib/shmem.C' || echo '$(srcdir)/'`../lib/shmem.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='shmem.o' libtool=no @AMDEPBACKSLASH@
@@ -412,19 +407,19 @@ shmem.o: ../lib/shmem.C
 
 shmem.obj: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shmem.obj -MD -MP -MF "$(DEPDIR)/shmem.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='shmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/shmem.Po' tmpdepfile='$(DEPDIR)/shmem.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`
 
 util.o: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.o -MD -MP -MF "$(DEPDIR)/util.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o util.o `test -f '../lib/util.C' || echo '$(srcdir)/'`../lib/util.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.o' libtool=no @AMDEPBACKSLASH@
@@ -434,19 +429,19 @@ util.o: ../lib/util.C
 
 util.obj: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.obj -MD -MP -MF "$(DEPDIR)/util.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/util.Po' tmpdepfile='$(DEPDIR)/util.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`
 
 app_ipc.o: ../lib/app_ipc.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT app_ipc.o -MD -MP -MF "$(DEPDIR)/app_ipc.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o app_ipc.o `test -f '../lib/app_ipc.C' || echo '$(srcdir)/'`../lib/app_ipc.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/app_ipc.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/app_ipc.C' object='app_ipc.o' libtool=no @AMDEPBACKSLASH@
@@ -456,19 +451,19 @@ app_ipc.o: ../lib/app_ipc.C
 
 app_ipc.obj: ../lib/app_ipc.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT app_ipc.obj -MD -MP -MF "$(DEPDIR)/app_ipc.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/app_ipc.Tpo" "$(DEPDIR)/app_ipc.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/app_ipc.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/app_ipc.C' object='app_ipc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/app_ipc.Po' tmpdepfile='$(DEPDIR)/app_ipc.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'; fi`
 
 boinc_api.o: ../api/boinc_api.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_api.o -MD -MP -MF "$(DEPDIR)/boinc_api.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_api.o `test -f '../api/boinc_api.C' || echo '$(srcdir)/'`../api/boinc_api.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_api.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/boinc_api.C' object='boinc_api.o' libtool=no @AMDEPBACKSLASH@
@@ -478,14 +473,14 @@ boinc_api.o: ../api/boinc_api.C
 
 boinc_api.obj: ../api/boinc_api.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_api.obj -MD -MP -MF "$(DEPDIR)/boinc_api.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_api.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/boinc_api.C' object='boinc_api.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_api.Po' tmpdepfile='$(DEPDIR)/boinc_api.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -547,11 +542,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -578,7 +575,6 @@ all-am: Makefile $(LIBRARIES) $(PROGRAMS)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/client/Makefile.in b/client/Makefile.in
index 854073f995..09dbe83ddb 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -112,6 +112,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -225,6 +226,7 @@ EXTRA_DIST = \
         translation/language.* 
 
 subdir = client
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -349,40 +351,6 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-boinc_client-main.$(OBJEXT): main.C
-boinc_client-account.$(OBJEXT): account.C
-boinc_client-app.$(OBJEXT): app.C
-boinc_client-client_state.$(OBJEXT): client_state.C
-boinc_client-client_types.$(OBJEXT): client_types.C
-boinc_client-cs_apps.$(OBJEXT): cs_apps.C
-boinc_client-cs_files.$(OBJEXT): cs_files.C
-boinc_client-cs_scheduler.$(OBJEXT): cs_scheduler.C
-boinc_client-file_names.$(OBJEXT): file_names.C
-boinc_client-file_xfer.$(OBJEXT): file_xfer.C
-boinc_client-hostinfo.$(OBJEXT): hostinfo.C
-boinc_client-hostinfo_unix.$(OBJEXT): hostinfo_unix.C
-boinc_client-http.$(OBJEXT): http.C
-boinc_client-log_flags.$(OBJEXT): log_flags.C
-boinc_client-message.$(OBJEXT): message.C
-boinc_client-net_stats.$(OBJEXT): net_stats.C
-boinc_client-net_xfer.$(OBJEXT): net_xfer.C
-boinc_client-pers_file_xfer.$(OBJEXT): pers_file_xfer.C
-boinc_client-prefs.$(OBJEXT): prefs.C
-boinc_client-scheduler_op.$(OBJEXT): scheduler_op.C
-boinc_client-speed_stats.$(OBJEXT): speed_stats.C
-boinc_client-ss_logic.$(OBJEXT): ss_logic.C
-boinc_client-time_stats.$(OBJEXT): time_stats.C
-boinc_client-client_messages.$(OBJEXT): client_messages.C
-boinc_client-app_ipc.$(OBJEXT): ../lib/app_ipc.C
-boinc_client-filesys.$(OBJEXT): ../lib/filesys.C
-boinc_client-language.$(OBJEXT): ../lib/language.C
-boinc_client-parse.$(OBJEXT): ../lib/parse.C
-boinc_client-shmem.$(OBJEXT): ../lib/shmem.C
-boinc_client-md5_file.$(OBJEXT): ../lib/md5_file.C
-boinc_client-md5.$(OBJEXT): ../lib/md5.c
-boinc_client-crypt.$(OBJEXT): ../lib/crypt.C
-boinc_client-util.$(OBJEXT): ../lib/util.C
-boinc_client-messages.$(OBJEXT): ../lib/messages.C
 boinc_client$(EXEEXT): $(boinc_client_OBJECTS) $(boinc_client_DEPENDENCIES) 
 	@rm -f boinc_client$(EXEEXT)
 	$(CXXLINK) $(boinc_client_LDFLAGS) $(boinc_client_OBJECTS) $(boinc_client_LDADD) $(LIBS)
@@ -438,7 +406,7 @@ distclean-depend:
 .C.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -448,19 +416,19 @@ distclean-depend:
 
 .C.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 boinc_client-main.o: main.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-main.o -MD -MP -MF "$(DEPDIR)/boinc_client-main.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-main.o `test -f 'main.C' || echo '$(srcdir)/'`main.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-main.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.C' object='boinc_client-main.o' libtool=no @AMDEPBACKSLASH@
@@ -470,19 +438,19 @@ boinc_client-main.o: main.C
 
 boinc_client-main.obj: main.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-main.obj -MD -MP -MF "$(DEPDIR)/boinc_client-main.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-main.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.C' object='boinc_client-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-main.Po' tmpdepfile='$(DEPDIR)/boinc_client-main.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'; fi`
 
 boinc_client-account.o: account.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-account.o -MD -MP -MF "$(DEPDIR)/boinc_client-account.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-account.o `test -f 'account.C' || echo '$(srcdir)/'`account.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-account.Tpo" "$(DEPDIR)/boinc_client-account.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-account.Tpo" "$(DEPDIR)/boinc_client-account.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-account.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='account.C' object='boinc_client-account.o' libtool=no @AMDEPBACKSLASH@
@@ -492,19 +460,19 @@ boinc_client-account.o: account.C
 
 boinc_client-account.obj: account.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-account.obj -MD -MP -MF "$(DEPDIR)/boinc_client-account.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-account.obj `if test -f 'account.C'; then $(CYGPATH_W) 'account.C'; else $(CYGPATH_W) '$(srcdir)/account.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-account.Tpo" "$(DEPDIR)/boinc_client-account.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-account.obj `if test -f 'account.C'; then $(CYGPATH_W) 'account.C'; else $(CYGPATH_W) '$(srcdir)/account.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-account.Tpo" "$(DEPDIR)/boinc_client-account.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-account.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='account.C' object='boinc_client-account.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-account.Po' tmpdepfile='$(DEPDIR)/boinc_client-account.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-account.obj `if test -f 'account.C'; then $(CYGPATH_W) 'account.C'; else $(CYGPATH_W) '$(srcdir)/account.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-account.obj `if test -f 'account.C'; then $(CYGPATH_W) 'account.C'; else $(CYGPATH_W) '$(srcdir)/account.C'; fi`
 
 boinc_client-app.o: app.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-app.o -MD -MP -MF "$(DEPDIR)/boinc_client-app.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-app.o `test -f 'app.C' || echo '$(srcdir)/'`app.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-app.Tpo" "$(DEPDIR)/boinc_client-app.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-app.Tpo" "$(DEPDIR)/boinc_client-app.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-app.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='app.C' object='boinc_client-app.o' libtool=no @AMDEPBACKSLASH@
@@ -514,19 +482,19 @@ boinc_client-app.o: app.C
 
 boinc_client-app.obj: app.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-app.obj -MD -MP -MF "$(DEPDIR)/boinc_client-app.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-app.obj `if test -f 'app.C'; then $(CYGPATH_W) 'app.C'; else $(CYGPATH_W) '$(srcdir)/app.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-app.Tpo" "$(DEPDIR)/boinc_client-app.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-app.obj `if test -f 'app.C'; then $(CYGPATH_W) 'app.C'; else $(CYGPATH_W) '$(srcdir)/app.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-app.Tpo" "$(DEPDIR)/boinc_client-app.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-app.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='app.C' object='boinc_client-app.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-app.Po' tmpdepfile='$(DEPDIR)/boinc_client-app.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-app.obj `if test -f 'app.C'; then $(CYGPATH_W) 'app.C'; else $(CYGPATH_W) '$(srcdir)/app.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-app.obj `if test -f 'app.C'; then $(CYGPATH_W) 'app.C'; else $(CYGPATH_W) '$(srcdir)/app.C'; fi`
 
 boinc_client-client_state.o: client_state.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_state.o -MD -MP -MF "$(DEPDIR)/boinc_client-client_state.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-client_state.o `test -f 'client_state.C' || echo '$(srcdir)/'`client_state.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-client_state.Tpo" "$(DEPDIR)/boinc_client-client_state.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-client_state.Tpo" "$(DEPDIR)/boinc_client-client_state.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-client_state.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='client_state.C' object='boinc_client-client_state.o' libtool=no @AMDEPBACKSLASH@
@@ -536,19 +504,19 @@ boinc_client-client_state.o: client_state.C
 
 boinc_client-client_state.obj: client_state.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_state.obj -MD -MP -MF "$(DEPDIR)/boinc_client-client_state.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-client_state.obj `if test -f 'client_state.C'; then $(CYGPATH_W) 'client_state.C'; else $(CYGPATH_W) '$(srcdir)/client_state.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-client_state.Tpo" "$(DEPDIR)/boinc_client-client_state.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-client_state.obj `if test -f 'client_state.C'; then $(CYGPATH_W) 'client_state.C'; else $(CYGPATH_W) '$(srcdir)/client_state.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-client_state.Tpo" "$(DEPDIR)/boinc_client-client_state.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-client_state.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='client_state.C' object='boinc_client-client_state.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-client_state.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_state.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_state.obj `if test -f 'client_state.C'; then $(CYGPATH_W) 'client_state.C'; else $(CYGPATH_W) '$(srcdir)/client_state.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_state.obj `if test -f 'client_state.C'; then $(CYGPATH_W) 'client_state.C'; else $(CYGPATH_W) '$(srcdir)/client_state.C'; fi`
 
 boinc_client-client_types.o: client_types.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_types.o -MD -MP -MF "$(DEPDIR)/boinc_client-client_types.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-client_types.o `test -f 'client_types.C' || echo '$(srcdir)/'`client_types.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-client_types.Tpo" "$(DEPDIR)/boinc_client-client_types.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-client_types.Tpo" "$(DEPDIR)/boinc_client-client_types.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-client_types.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='client_types.C' object='boinc_client-client_types.o' libtool=no @AMDEPBACKSLASH@
@@ -558,19 +526,19 @@ boinc_client-client_types.o: client_types.C
 
 boinc_client-client_types.obj: client_types.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_types.obj -MD -MP -MF "$(DEPDIR)/boinc_client-client_types.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-client_types.obj `if test -f 'client_types.C'; then $(CYGPATH_W) 'client_types.C'; else $(CYGPATH_W) '$(srcdir)/client_types.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-client_types.Tpo" "$(DEPDIR)/boinc_client-client_types.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-client_types.obj `if test -f 'client_types.C'; then $(CYGPATH_W) 'client_types.C'; else $(CYGPATH_W) '$(srcdir)/client_types.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-client_types.Tpo" "$(DEPDIR)/boinc_client-client_types.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-client_types.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='client_types.C' object='boinc_client-client_types.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-client_types.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_types.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_types.obj `if test -f 'client_types.C'; then $(CYGPATH_W) 'client_types.C'; else $(CYGPATH_W) '$(srcdir)/client_types.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_types.obj `if test -f 'client_types.C'; then $(CYGPATH_W) 'client_types.C'; else $(CYGPATH_W) '$(srcdir)/client_types.C'; fi`
 
 boinc_client-cs_apps.o: cs_apps.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_apps.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_apps.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_apps.o `test -f 'cs_apps.C' || echo '$(srcdir)/'`cs_apps.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_apps.Tpo" "$(DEPDIR)/boinc_client-cs_apps.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_apps.Tpo" "$(DEPDIR)/boinc_client-cs_apps.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_apps.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_apps.C' object='boinc_client-cs_apps.o' libtool=no @AMDEPBACKSLASH@
@@ -580,19 +548,19 @@ boinc_client-cs_apps.o: cs_apps.C
 
 boinc_client-cs_apps.obj: cs_apps.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_apps.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_apps.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_apps.obj `if test -f 'cs_apps.C'; then $(CYGPATH_W) 'cs_apps.C'; else $(CYGPATH_W) '$(srcdir)/cs_apps.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_apps.Tpo" "$(DEPDIR)/boinc_client-cs_apps.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_apps.obj `if test -f 'cs_apps.C'; then $(CYGPATH_W) 'cs_apps.C'; else $(CYGPATH_W) '$(srcdir)/cs_apps.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_apps.Tpo" "$(DEPDIR)/boinc_client-cs_apps.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_apps.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_apps.C' object='boinc_client-cs_apps.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_apps.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_apps.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_apps.obj `if test -f 'cs_apps.C'; then $(CYGPATH_W) 'cs_apps.C'; else $(CYGPATH_W) '$(srcdir)/cs_apps.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_apps.obj `if test -f 'cs_apps.C'; then $(CYGPATH_W) 'cs_apps.C'; else $(CYGPATH_W) '$(srcdir)/cs_apps.C'; fi`
 
 boinc_client-cs_files.o: cs_files.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_files.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_files.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_files.o `test -f 'cs_files.C' || echo '$(srcdir)/'`cs_files.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_files.Tpo" "$(DEPDIR)/boinc_client-cs_files.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_files.Tpo" "$(DEPDIR)/boinc_client-cs_files.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_files.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_files.C' object='boinc_client-cs_files.o' libtool=no @AMDEPBACKSLASH@
@@ -602,19 +570,19 @@ boinc_client-cs_files.o: cs_files.C
 
 boinc_client-cs_files.obj: cs_files.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_files.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_files.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_files.obj `if test -f 'cs_files.C'; then $(CYGPATH_W) 'cs_files.C'; else $(CYGPATH_W) '$(srcdir)/cs_files.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_files.Tpo" "$(DEPDIR)/boinc_client-cs_files.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_files.obj `if test -f 'cs_files.C'; then $(CYGPATH_W) 'cs_files.C'; else $(CYGPATH_W) '$(srcdir)/cs_files.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_files.Tpo" "$(DEPDIR)/boinc_client-cs_files.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_files.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_files.C' object='boinc_client-cs_files.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_files.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_files.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_files.obj `if test -f 'cs_files.C'; then $(CYGPATH_W) 'cs_files.C'; else $(CYGPATH_W) '$(srcdir)/cs_files.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_files.obj `if test -f 'cs_files.C'; then $(CYGPATH_W) 'cs_files.C'; else $(CYGPATH_W) '$(srcdir)/cs_files.C'; fi`
 
 boinc_client-cs_scheduler.o: cs_scheduler.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_scheduler.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_scheduler.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_scheduler.o `test -f 'cs_scheduler.C' || echo '$(srcdir)/'`cs_scheduler.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_scheduler.Tpo" "$(DEPDIR)/boinc_client-cs_scheduler.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_scheduler.Tpo" "$(DEPDIR)/boinc_client-cs_scheduler.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_scheduler.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_scheduler.C' object='boinc_client-cs_scheduler.o' libtool=no @AMDEPBACKSLASH@
@@ -624,19 +592,19 @@ boinc_client-cs_scheduler.o: cs_scheduler.C
 
 boinc_client-cs_scheduler.obj: cs_scheduler.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_scheduler.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_scheduler.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_scheduler.obj `if test -f 'cs_scheduler.C'; then $(CYGPATH_W) 'cs_scheduler.C'; else $(CYGPATH_W) '$(srcdir)/cs_scheduler.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_scheduler.Tpo" "$(DEPDIR)/boinc_client-cs_scheduler.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_scheduler.obj `if test -f 'cs_scheduler.C'; then $(CYGPATH_W) 'cs_scheduler.C'; else $(CYGPATH_W) '$(srcdir)/cs_scheduler.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_scheduler.Tpo" "$(DEPDIR)/boinc_client-cs_scheduler.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_scheduler.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_scheduler.C' object='boinc_client-cs_scheduler.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_scheduler.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_scheduler.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_scheduler.obj `if test -f 'cs_scheduler.C'; then $(CYGPATH_W) 'cs_scheduler.C'; else $(CYGPATH_W) '$(srcdir)/cs_scheduler.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_scheduler.obj `if test -f 'cs_scheduler.C'; then $(CYGPATH_W) 'cs_scheduler.C'; else $(CYGPATH_W) '$(srcdir)/cs_scheduler.C'; fi`
 
 boinc_client-file_names.o: file_names.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-file_names.o -MD -MP -MF "$(DEPDIR)/boinc_client-file_names.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-file_names.o `test -f 'file_names.C' || echo '$(srcdir)/'`file_names.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-file_names.Tpo" "$(DEPDIR)/boinc_client-file_names.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-file_names.Tpo" "$(DEPDIR)/boinc_client-file_names.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-file_names.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='file_names.C' object='boinc_client-file_names.o' libtool=no @AMDEPBACKSLASH@
@@ -646,19 +614,19 @@ boinc_client-file_names.o: file_names.C
 
 boinc_client-file_names.obj: file_names.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-file_names.obj -MD -MP -MF "$(DEPDIR)/boinc_client-file_names.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-file_names.obj `if test -f 'file_names.C'; then $(CYGPATH_W) 'file_names.C'; else $(CYGPATH_W) '$(srcdir)/file_names.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-file_names.Tpo" "$(DEPDIR)/boinc_client-file_names.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-file_names.obj `if test -f 'file_names.C'; then $(CYGPATH_W) 'file_names.C'; else $(CYGPATH_W) '$(srcdir)/file_names.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-file_names.Tpo" "$(DEPDIR)/boinc_client-file_names.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-file_names.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='file_names.C' object='boinc_client-file_names.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-file_names.Po' tmpdepfile='$(DEPDIR)/boinc_client-file_names.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-file_names.obj `if test -f 'file_names.C'; then $(CYGPATH_W) 'file_names.C'; else $(CYGPATH_W) '$(srcdir)/file_names.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-file_names.obj `if test -f 'file_names.C'; then $(CYGPATH_W) 'file_names.C'; else $(CYGPATH_W) '$(srcdir)/file_names.C'; fi`
 
 boinc_client-file_xfer.o: file_xfer.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-file_xfer.o -MD -MP -MF "$(DEPDIR)/boinc_client-file_xfer.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-file_xfer.o `test -f 'file_xfer.C' || echo '$(srcdir)/'`file_xfer.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-file_xfer.Tpo" "$(DEPDIR)/boinc_client-file_xfer.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-file_xfer.Tpo" "$(DEPDIR)/boinc_client-file_xfer.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-file_xfer.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='file_xfer.C' object='boinc_client-file_xfer.o' libtool=no @AMDEPBACKSLASH@
@@ -668,19 +636,19 @@ boinc_client-file_xfer.o: file_xfer.C
 
 boinc_client-file_xfer.obj: file_xfer.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-file_xfer.obj -MD -MP -MF "$(DEPDIR)/boinc_client-file_xfer.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-file_xfer.obj `if test -f 'file_xfer.C'; then $(CYGPATH_W) 'file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/file_xfer.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-file_xfer.Tpo" "$(DEPDIR)/boinc_client-file_xfer.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-file_xfer.obj `if test -f 'file_xfer.C'; then $(CYGPATH_W) 'file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/file_xfer.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-file_xfer.Tpo" "$(DEPDIR)/boinc_client-file_xfer.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-file_xfer.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='file_xfer.C' object='boinc_client-file_xfer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-file_xfer.Po' tmpdepfile='$(DEPDIR)/boinc_client-file_xfer.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-file_xfer.obj `if test -f 'file_xfer.C'; then $(CYGPATH_W) 'file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/file_xfer.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-file_xfer.obj `if test -f 'file_xfer.C'; then $(CYGPATH_W) 'file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/file_xfer.C'; fi`
 
 boinc_client-hostinfo.o: hostinfo.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-hostinfo.o -MD -MP -MF "$(DEPDIR)/boinc_client-hostinfo.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-hostinfo.o `test -f 'hostinfo.C' || echo '$(srcdir)/'`hostinfo.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-hostinfo.Tpo" "$(DEPDIR)/boinc_client-hostinfo.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-hostinfo.Tpo" "$(DEPDIR)/boinc_client-hostinfo.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-hostinfo.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hostinfo.C' object='boinc_client-hostinfo.o' libtool=no @AMDEPBACKSLASH@
@@ -690,19 +658,19 @@ boinc_client-hostinfo.o: hostinfo.C
 
 boinc_client-hostinfo.obj: hostinfo.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-hostinfo.obj -MD -MP -MF "$(DEPDIR)/boinc_client-hostinfo.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-hostinfo.obj `if test -f 'hostinfo.C'; then $(CYGPATH_W) 'hostinfo.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-hostinfo.Tpo" "$(DEPDIR)/boinc_client-hostinfo.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-hostinfo.obj `if test -f 'hostinfo.C'; then $(CYGPATH_W) 'hostinfo.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-hostinfo.Tpo" "$(DEPDIR)/boinc_client-hostinfo.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-hostinfo.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hostinfo.C' object='boinc_client-hostinfo.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-hostinfo.Po' tmpdepfile='$(DEPDIR)/boinc_client-hostinfo.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-hostinfo.obj `if test -f 'hostinfo.C'; then $(CYGPATH_W) 'hostinfo.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-hostinfo.obj `if test -f 'hostinfo.C'; then $(CYGPATH_W) 'hostinfo.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo.C'; fi`
 
 boinc_client-hostinfo_unix.o: hostinfo_unix.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-hostinfo_unix.o -MD -MP -MF "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-hostinfo_unix.o `test -f 'hostinfo_unix.C' || echo '$(srcdir)/'`hostinfo_unix.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo" "$(DEPDIR)/boinc_client-hostinfo_unix.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo" "$(DEPDIR)/boinc_client-hostinfo_unix.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hostinfo_unix.C' object='boinc_client-hostinfo_unix.o' libtool=no @AMDEPBACKSLASH@
@@ -712,19 +680,19 @@ boinc_client-hostinfo_unix.o: hostinfo_unix.C
 
 boinc_client-hostinfo_unix.obj: hostinfo_unix.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-hostinfo_unix.obj -MD -MP -MF "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-hostinfo_unix.obj `if test -f 'hostinfo_unix.C'; then $(CYGPATH_W) 'hostinfo_unix.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo_unix.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo" "$(DEPDIR)/boinc_client-hostinfo_unix.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-hostinfo_unix.obj `if test -f 'hostinfo_unix.C'; then $(CYGPATH_W) 'hostinfo_unix.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo_unix.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo" "$(DEPDIR)/boinc_client-hostinfo_unix.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-hostinfo_unix.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hostinfo_unix.C' object='boinc_client-hostinfo_unix.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-hostinfo_unix.Po' tmpdepfile='$(DEPDIR)/boinc_client-hostinfo_unix.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-hostinfo_unix.obj `if test -f 'hostinfo_unix.C'; then $(CYGPATH_W) 'hostinfo_unix.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo_unix.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-hostinfo_unix.obj `if test -f 'hostinfo_unix.C'; then $(CYGPATH_W) 'hostinfo_unix.C'; else $(CYGPATH_W) '$(srcdir)/hostinfo_unix.C'; fi`
 
 boinc_client-http.o: http.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-http.o -MD -MP -MF "$(DEPDIR)/boinc_client-http.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-http.o `test -f 'http.C' || echo '$(srcdir)/'`http.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-http.Tpo" "$(DEPDIR)/boinc_client-http.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-http.Tpo" "$(DEPDIR)/boinc_client-http.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-http.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='http.C' object='boinc_client-http.o' libtool=no @AMDEPBACKSLASH@
@@ -734,19 +702,19 @@ boinc_client-http.o: http.C
 
 boinc_client-http.obj: http.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-http.obj -MD -MP -MF "$(DEPDIR)/boinc_client-http.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-http.obj `if test -f 'http.C'; then $(CYGPATH_W) 'http.C'; else $(CYGPATH_W) '$(srcdir)/http.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-http.Tpo" "$(DEPDIR)/boinc_client-http.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-http.obj `if test -f 'http.C'; then $(CYGPATH_W) 'http.C'; else $(CYGPATH_W) '$(srcdir)/http.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-http.Tpo" "$(DEPDIR)/boinc_client-http.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-http.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='http.C' object='boinc_client-http.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-http.Po' tmpdepfile='$(DEPDIR)/boinc_client-http.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-http.obj `if test -f 'http.C'; then $(CYGPATH_W) 'http.C'; else $(CYGPATH_W) '$(srcdir)/http.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-http.obj `if test -f 'http.C'; then $(CYGPATH_W) 'http.C'; else $(CYGPATH_W) '$(srcdir)/http.C'; fi`
 
 boinc_client-log_flags.o: log_flags.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-log_flags.o -MD -MP -MF "$(DEPDIR)/boinc_client-log_flags.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-log_flags.o `test -f 'log_flags.C' || echo '$(srcdir)/'`log_flags.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-log_flags.Tpo" "$(DEPDIR)/boinc_client-log_flags.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-log_flags.Tpo" "$(DEPDIR)/boinc_client-log_flags.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-log_flags.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='log_flags.C' object='boinc_client-log_flags.o' libtool=no @AMDEPBACKSLASH@
@@ -756,19 +724,19 @@ boinc_client-log_flags.o: log_flags.C
 
 boinc_client-log_flags.obj: log_flags.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-log_flags.obj -MD -MP -MF "$(DEPDIR)/boinc_client-log_flags.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-log_flags.obj `if test -f 'log_flags.C'; then $(CYGPATH_W) 'log_flags.C'; else $(CYGPATH_W) '$(srcdir)/log_flags.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-log_flags.Tpo" "$(DEPDIR)/boinc_client-log_flags.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-log_flags.obj `if test -f 'log_flags.C'; then $(CYGPATH_W) 'log_flags.C'; else $(CYGPATH_W) '$(srcdir)/log_flags.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-log_flags.Tpo" "$(DEPDIR)/boinc_client-log_flags.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-log_flags.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='log_flags.C' object='boinc_client-log_flags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-log_flags.Po' tmpdepfile='$(DEPDIR)/boinc_client-log_flags.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-log_flags.obj `if test -f 'log_flags.C'; then $(CYGPATH_W) 'log_flags.C'; else $(CYGPATH_W) '$(srcdir)/log_flags.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-log_flags.obj `if test -f 'log_flags.C'; then $(CYGPATH_W) 'log_flags.C'; else $(CYGPATH_W) '$(srcdir)/log_flags.C'; fi`
 
 boinc_client-message.o: message.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-message.o -MD -MP -MF "$(DEPDIR)/boinc_client-message.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-message.o `test -f 'message.C' || echo '$(srcdir)/'`message.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-message.Tpo" "$(DEPDIR)/boinc_client-message.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-message.Tpo" "$(DEPDIR)/boinc_client-message.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-message.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='message.C' object='boinc_client-message.o' libtool=no @AMDEPBACKSLASH@
@@ -778,19 +746,19 @@ boinc_client-message.o: message.C
 
 boinc_client-message.obj: message.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-message.obj -MD -MP -MF "$(DEPDIR)/boinc_client-message.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-message.obj `if test -f 'message.C'; then $(CYGPATH_W) 'message.C'; else $(CYGPATH_W) '$(srcdir)/message.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-message.Tpo" "$(DEPDIR)/boinc_client-message.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-message.obj `if test -f 'message.C'; then $(CYGPATH_W) 'message.C'; else $(CYGPATH_W) '$(srcdir)/message.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-message.Tpo" "$(DEPDIR)/boinc_client-message.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-message.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='message.C' object='boinc_client-message.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-message.Po' tmpdepfile='$(DEPDIR)/boinc_client-message.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-message.obj `if test -f 'message.C'; then $(CYGPATH_W) 'message.C'; else $(CYGPATH_W) '$(srcdir)/message.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-message.obj `if test -f 'message.C'; then $(CYGPATH_W) 'message.C'; else $(CYGPATH_W) '$(srcdir)/message.C'; fi`
 
 boinc_client-net_stats.o: net_stats.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-net_stats.o -MD -MP -MF "$(DEPDIR)/boinc_client-net_stats.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-net_stats.o `test -f 'net_stats.C' || echo '$(srcdir)/'`net_stats.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-net_stats.Tpo" "$(DEPDIR)/boinc_client-net_stats.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-net_stats.Tpo" "$(DEPDIR)/boinc_client-net_stats.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-net_stats.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='net_stats.C' object='boinc_client-net_stats.o' libtool=no @AMDEPBACKSLASH@
@@ -800,19 +768,19 @@ boinc_client-net_stats.o: net_stats.C
 
 boinc_client-net_stats.obj: net_stats.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-net_stats.obj -MD -MP -MF "$(DEPDIR)/boinc_client-net_stats.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-net_stats.obj `if test -f 'net_stats.C'; then $(CYGPATH_W) 'net_stats.C'; else $(CYGPATH_W) '$(srcdir)/net_stats.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-net_stats.Tpo" "$(DEPDIR)/boinc_client-net_stats.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-net_stats.obj `if test -f 'net_stats.C'; then $(CYGPATH_W) 'net_stats.C'; else $(CYGPATH_W) '$(srcdir)/net_stats.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-net_stats.Tpo" "$(DEPDIR)/boinc_client-net_stats.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-net_stats.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='net_stats.C' object='boinc_client-net_stats.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-net_stats.Po' tmpdepfile='$(DEPDIR)/boinc_client-net_stats.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-net_stats.obj `if test -f 'net_stats.C'; then $(CYGPATH_W) 'net_stats.C'; else $(CYGPATH_W) '$(srcdir)/net_stats.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-net_stats.obj `if test -f 'net_stats.C'; then $(CYGPATH_W) 'net_stats.C'; else $(CYGPATH_W) '$(srcdir)/net_stats.C'; fi`
 
 boinc_client-net_xfer.o: net_xfer.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-net_xfer.o -MD -MP -MF "$(DEPDIR)/boinc_client-net_xfer.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-net_xfer.o `test -f 'net_xfer.C' || echo '$(srcdir)/'`net_xfer.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-net_xfer.Tpo" "$(DEPDIR)/boinc_client-net_xfer.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-net_xfer.Tpo" "$(DEPDIR)/boinc_client-net_xfer.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-net_xfer.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='net_xfer.C' object='boinc_client-net_xfer.o' libtool=no @AMDEPBACKSLASH@
@@ -822,19 +790,19 @@ boinc_client-net_xfer.o: net_xfer.C
 
 boinc_client-net_xfer.obj: net_xfer.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-net_xfer.obj -MD -MP -MF "$(DEPDIR)/boinc_client-net_xfer.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-net_xfer.obj `if test -f 'net_xfer.C'; then $(CYGPATH_W) 'net_xfer.C'; else $(CYGPATH_W) '$(srcdir)/net_xfer.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-net_xfer.Tpo" "$(DEPDIR)/boinc_client-net_xfer.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-net_xfer.obj `if test -f 'net_xfer.C'; then $(CYGPATH_W) 'net_xfer.C'; else $(CYGPATH_W) '$(srcdir)/net_xfer.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-net_xfer.Tpo" "$(DEPDIR)/boinc_client-net_xfer.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-net_xfer.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='net_xfer.C' object='boinc_client-net_xfer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-net_xfer.Po' tmpdepfile='$(DEPDIR)/boinc_client-net_xfer.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-net_xfer.obj `if test -f 'net_xfer.C'; then $(CYGPATH_W) 'net_xfer.C'; else $(CYGPATH_W) '$(srcdir)/net_xfer.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-net_xfer.obj `if test -f 'net_xfer.C'; then $(CYGPATH_W) 'net_xfer.C'; else $(CYGPATH_W) '$(srcdir)/net_xfer.C'; fi`
 
 boinc_client-pers_file_xfer.o: pers_file_xfer.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-pers_file_xfer.o -MD -MP -MF "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-pers_file_xfer.o `test -f 'pers_file_xfer.C' || echo '$(srcdir)/'`pers_file_xfer.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo" "$(DEPDIR)/boinc_client-pers_file_xfer.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo" "$(DEPDIR)/boinc_client-pers_file_xfer.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='pers_file_xfer.C' object='boinc_client-pers_file_xfer.o' libtool=no @AMDEPBACKSLASH@
@@ -844,19 +812,19 @@ boinc_client-pers_file_xfer.o: pers_file_xfer.C
 
 boinc_client-pers_file_xfer.obj: pers_file_xfer.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-pers_file_xfer.obj -MD -MP -MF "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-pers_file_xfer.obj `if test -f 'pers_file_xfer.C'; then $(CYGPATH_W) 'pers_file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/pers_file_xfer.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo" "$(DEPDIR)/boinc_client-pers_file_xfer.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-pers_file_xfer.obj `if test -f 'pers_file_xfer.C'; then $(CYGPATH_W) 'pers_file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/pers_file_xfer.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo" "$(DEPDIR)/boinc_client-pers_file_xfer.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-pers_file_xfer.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='pers_file_xfer.C' object='boinc_client-pers_file_xfer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-pers_file_xfer.Po' tmpdepfile='$(DEPDIR)/boinc_client-pers_file_xfer.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-pers_file_xfer.obj `if test -f 'pers_file_xfer.C'; then $(CYGPATH_W) 'pers_file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/pers_file_xfer.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-pers_file_xfer.obj `if test -f 'pers_file_xfer.C'; then $(CYGPATH_W) 'pers_file_xfer.C'; else $(CYGPATH_W) '$(srcdir)/pers_file_xfer.C'; fi`
 
 boinc_client-prefs.o: prefs.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-prefs.o -MD -MP -MF "$(DEPDIR)/boinc_client-prefs.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-prefs.o `test -f 'prefs.C' || echo '$(srcdir)/'`prefs.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-prefs.Tpo" "$(DEPDIR)/boinc_client-prefs.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-prefs.Tpo" "$(DEPDIR)/boinc_client-prefs.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-prefs.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='prefs.C' object='boinc_client-prefs.o' libtool=no @AMDEPBACKSLASH@
@@ -866,19 +834,19 @@ boinc_client-prefs.o: prefs.C
 
 boinc_client-prefs.obj: prefs.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-prefs.obj -MD -MP -MF "$(DEPDIR)/boinc_client-prefs.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-prefs.obj `if test -f 'prefs.C'; then $(CYGPATH_W) 'prefs.C'; else $(CYGPATH_W) '$(srcdir)/prefs.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-prefs.Tpo" "$(DEPDIR)/boinc_client-prefs.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-prefs.obj `if test -f 'prefs.C'; then $(CYGPATH_W) 'prefs.C'; else $(CYGPATH_W) '$(srcdir)/prefs.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-prefs.Tpo" "$(DEPDIR)/boinc_client-prefs.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-prefs.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='prefs.C' object='boinc_client-prefs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-prefs.Po' tmpdepfile='$(DEPDIR)/boinc_client-prefs.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-prefs.obj `if test -f 'prefs.C'; then $(CYGPATH_W) 'prefs.C'; else $(CYGPATH_W) '$(srcdir)/prefs.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-prefs.obj `if test -f 'prefs.C'; then $(CYGPATH_W) 'prefs.C'; else $(CYGPATH_W) '$(srcdir)/prefs.C'; fi`
 
 boinc_client-scheduler_op.o: scheduler_op.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-scheduler_op.o -MD -MP -MF "$(DEPDIR)/boinc_client-scheduler_op.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-scheduler_op.o `test -f 'scheduler_op.C' || echo '$(srcdir)/'`scheduler_op.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-scheduler_op.Tpo" "$(DEPDIR)/boinc_client-scheduler_op.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-scheduler_op.Tpo" "$(DEPDIR)/boinc_client-scheduler_op.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-scheduler_op.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='scheduler_op.C' object='boinc_client-scheduler_op.o' libtool=no @AMDEPBACKSLASH@
@@ -888,19 +856,19 @@ boinc_client-scheduler_op.o: scheduler_op.C
 
 boinc_client-scheduler_op.obj: scheduler_op.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-scheduler_op.obj -MD -MP -MF "$(DEPDIR)/boinc_client-scheduler_op.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-scheduler_op.obj `if test -f 'scheduler_op.C'; then $(CYGPATH_W) 'scheduler_op.C'; else $(CYGPATH_W) '$(srcdir)/scheduler_op.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-scheduler_op.Tpo" "$(DEPDIR)/boinc_client-scheduler_op.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-scheduler_op.obj `if test -f 'scheduler_op.C'; then $(CYGPATH_W) 'scheduler_op.C'; else $(CYGPATH_W) '$(srcdir)/scheduler_op.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-scheduler_op.Tpo" "$(DEPDIR)/boinc_client-scheduler_op.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-scheduler_op.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='scheduler_op.C' object='boinc_client-scheduler_op.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-scheduler_op.Po' tmpdepfile='$(DEPDIR)/boinc_client-scheduler_op.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-scheduler_op.obj `if test -f 'scheduler_op.C'; then $(CYGPATH_W) 'scheduler_op.C'; else $(CYGPATH_W) '$(srcdir)/scheduler_op.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-scheduler_op.obj `if test -f 'scheduler_op.C'; then $(CYGPATH_W) 'scheduler_op.C'; else $(CYGPATH_W) '$(srcdir)/scheduler_op.C'; fi`
 
 boinc_client-speed_stats.o: speed_stats.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-speed_stats.o -MD -MP -MF "$(DEPDIR)/boinc_client-speed_stats.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-speed_stats.o `test -f 'speed_stats.C' || echo '$(srcdir)/'`speed_stats.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-speed_stats.Tpo" "$(DEPDIR)/boinc_client-speed_stats.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-speed_stats.Tpo" "$(DEPDIR)/boinc_client-speed_stats.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-speed_stats.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='speed_stats.C' object='boinc_client-speed_stats.o' libtool=no @AMDEPBACKSLASH@
@@ -910,19 +878,19 @@ boinc_client-speed_stats.o: speed_stats.C
 
 boinc_client-speed_stats.obj: speed_stats.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-speed_stats.obj -MD -MP -MF "$(DEPDIR)/boinc_client-speed_stats.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-speed_stats.obj `if test -f 'speed_stats.C'; then $(CYGPATH_W) 'speed_stats.C'; else $(CYGPATH_W) '$(srcdir)/speed_stats.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-speed_stats.Tpo" "$(DEPDIR)/boinc_client-speed_stats.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-speed_stats.obj `if test -f 'speed_stats.C'; then $(CYGPATH_W) 'speed_stats.C'; else $(CYGPATH_W) '$(srcdir)/speed_stats.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-speed_stats.Tpo" "$(DEPDIR)/boinc_client-speed_stats.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-speed_stats.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='speed_stats.C' object='boinc_client-speed_stats.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-speed_stats.Po' tmpdepfile='$(DEPDIR)/boinc_client-speed_stats.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-speed_stats.obj `if test -f 'speed_stats.C'; then $(CYGPATH_W) 'speed_stats.C'; else $(CYGPATH_W) '$(srcdir)/speed_stats.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-speed_stats.obj `if test -f 'speed_stats.C'; then $(CYGPATH_W) 'speed_stats.C'; else $(CYGPATH_W) '$(srcdir)/speed_stats.C'; fi`
 
 boinc_client-ss_logic.o: ss_logic.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-ss_logic.o -MD -MP -MF "$(DEPDIR)/boinc_client-ss_logic.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-ss_logic.o `test -f 'ss_logic.C' || echo '$(srcdir)/'`ss_logic.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-ss_logic.Tpo" "$(DEPDIR)/boinc_client-ss_logic.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-ss_logic.Tpo" "$(DEPDIR)/boinc_client-ss_logic.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-ss_logic.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ss_logic.C' object='boinc_client-ss_logic.o' libtool=no @AMDEPBACKSLASH@
@@ -932,19 +900,19 @@ boinc_client-ss_logic.o: ss_logic.C
 
 boinc_client-ss_logic.obj: ss_logic.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-ss_logic.obj -MD -MP -MF "$(DEPDIR)/boinc_client-ss_logic.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-ss_logic.obj `if test -f 'ss_logic.C'; then $(CYGPATH_W) 'ss_logic.C'; else $(CYGPATH_W) '$(srcdir)/ss_logic.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-ss_logic.Tpo" "$(DEPDIR)/boinc_client-ss_logic.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-ss_logic.obj `if test -f 'ss_logic.C'; then $(CYGPATH_W) 'ss_logic.C'; else $(CYGPATH_W) '$(srcdir)/ss_logic.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-ss_logic.Tpo" "$(DEPDIR)/boinc_client-ss_logic.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-ss_logic.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ss_logic.C' object='boinc_client-ss_logic.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-ss_logic.Po' tmpdepfile='$(DEPDIR)/boinc_client-ss_logic.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-ss_logic.obj `if test -f 'ss_logic.C'; then $(CYGPATH_W) 'ss_logic.C'; else $(CYGPATH_W) '$(srcdir)/ss_logic.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-ss_logic.obj `if test -f 'ss_logic.C'; then $(CYGPATH_W) 'ss_logic.C'; else $(CYGPATH_W) '$(srcdir)/ss_logic.C'; fi`
 
 boinc_client-time_stats.o: time_stats.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-time_stats.o -MD -MP -MF "$(DEPDIR)/boinc_client-time_stats.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-time_stats.o `test -f 'time_stats.C' || echo '$(srcdir)/'`time_stats.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-time_stats.Tpo" "$(DEPDIR)/boinc_client-time_stats.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-time_stats.Tpo" "$(DEPDIR)/boinc_client-time_stats.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-time_stats.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='time_stats.C' object='boinc_client-time_stats.o' libtool=no @AMDEPBACKSLASH@
@@ -954,19 +922,19 @@ boinc_client-time_stats.o: time_stats.C
 
 boinc_client-time_stats.obj: time_stats.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-time_stats.obj -MD -MP -MF "$(DEPDIR)/boinc_client-time_stats.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-time_stats.obj `if test -f 'time_stats.C'; then $(CYGPATH_W) 'time_stats.C'; else $(CYGPATH_W) '$(srcdir)/time_stats.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-time_stats.Tpo" "$(DEPDIR)/boinc_client-time_stats.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-time_stats.obj `if test -f 'time_stats.C'; then $(CYGPATH_W) 'time_stats.C'; else $(CYGPATH_W) '$(srcdir)/time_stats.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-time_stats.Tpo" "$(DEPDIR)/boinc_client-time_stats.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-time_stats.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='time_stats.C' object='boinc_client-time_stats.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-time_stats.Po' tmpdepfile='$(DEPDIR)/boinc_client-time_stats.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-time_stats.obj `if test -f 'time_stats.C'; then $(CYGPATH_W) 'time_stats.C'; else $(CYGPATH_W) '$(srcdir)/time_stats.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-time_stats.obj `if test -f 'time_stats.C'; then $(CYGPATH_W) 'time_stats.C'; else $(CYGPATH_W) '$(srcdir)/time_stats.C'; fi`
 
 boinc_client-client_messages.o: client_messages.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_messages.o -MD -MP -MF "$(DEPDIR)/boinc_client-client_messages.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-client_messages.o `test -f 'client_messages.C' || echo '$(srcdir)/'`client_messages.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-client_messages.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='client_messages.C' object='boinc_client-client_messages.o' libtool=no @AMDEPBACKSLASH@
@@ -976,19 +944,19 @@ boinc_client-client_messages.o: client_messages.C
 
 boinc_client-client_messages.obj: client_messages.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_messages.obj -MD -MP -MF "$(DEPDIR)/boinc_client-client_messages.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-client_messages.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='client_messages.C' object='boinc_client-client_messages.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-client_messages.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_messages.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'; fi`
 
 boinc_client-app_ipc.o: ../lib/app_ipc.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-app_ipc.o -MD -MP -MF "$(DEPDIR)/boinc_client-app_ipc.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-app_ipc.o `test -f '../lib/app_ipc.C' || echo '$(srcdir)/'`../lib/app_ipc.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-app_ipc.Tpo" "$(DEPDIR)/boinc_client-app_ipc.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-app_ipc.Tpo" "$(DEPDIR)/boinc_client-app_ipc.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-app_ipc.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/app_ipc.C' object='boinc_client-app_ipc.o' libtool=no @AMDEPBACKSLASH@
@@ -998,19 +966,19 @@ boinc_client-app_ipc.o: ../lib/app_ipc.C
 
 boinc_client-app_ipc.obj: ../lib/app_ipc.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-app_ipc.obj -MD -MP -MF "$(DEPDIR)/boinc_client-app_ipc.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-app_ipc.Tpo" "$(DEPDIR)/boinc_client-app_ipc.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-app_ipc.Tpo" "$(DEPDIR)/boinc_client-app_ipc.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-app_ipc.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/app_ipc.C' object='boinc_client-app_ipc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-app_ipc.Po' tmpdepfile='$(DEPDIR)/boinc_client-app_ipc.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-app_ipc.obj `if test -f '../lib/app_ipc.C'; then $(CYGPATH_W) '../lib/app_ipc.C'; else $(CYGPATH_W) '$(srcdir)/../lib/app_ipc.C'; fi`
 
 boinc_client-filesys.o: ../lib/filesys.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-filesys.o -MD -MP -MF "$(DEPDIR)/boinc_client-filesys.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-filesys.o `test -f '../lib/filesys.C' || echo '$(srcdir)/'`../lib/filesys.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-filesys.Tpo" "$(DEPDIR)/boinc_client-filesys.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-filesys.Tpo" "$(DEPDIR)/boinc_client-filesys.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-filesys.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/filesys.C' object='boinc_client-filesys.o' libtool=no @AMDEPBACKSLASH@
@@ -1020,19 +988,19 @@ boinc_client-filesys.o: ../lib/filesys.C
 
 boinc_client-filesys.obj: ../lib/filesys.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-filesys.obj -MD -MP -MF "$(DEPDIR)/boinc_client-filesys.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-filesys.Tpo" "$(DEPDIR)/boinc_client-filesys.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-filesys.Tpo" "$(DEPDIR)/boinc_client-filesys.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-filesys.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/filesys.C' object='boinc_client-filesys.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-filesys.Po' tmpdepfile='$(DEPDIR)/boinc_client-filesys.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-filesys.obj `if test -f '../lib/filesys.C'; then $(CYGPATH_W) '../lib/filesys.C'; else $(CYGPATH_W) '$(srcdir)/../lib/filesys.C'; fi`
 
 boinc_client-language.o: ../lib/language.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-language.o -MD -MP -MF "$(DEPDIR)/boinc_client-language.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-language.o `test -f '../lib/language.C' || echo '$(srcdir)/'`../lib/language.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-language.Tpo" "$(DEPDIR)/boinc_client-language.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-language.Tpo" "$(DEPDIR)/boinc_client-language.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-language.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/language.C' object='boinc_client-language.o' libtool=no @AMDEPBACKSLASH@
@@ -1042,19 +1010,19 @@ boinc_client-language.o: ../lib/language.C
 
 boinc_client-language.obj: ../lib/language.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-language.obj -MD -MP -MF "$(DEPDIR)/boinc_client-language.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-language.obj `if test -f '../lib/language.C'; then $(CYGPATH_W) '../lib/language.C'; else $(CYGPATH_W) '$(srcdir)/../lib/language.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-language.Tpo" "$(DEPDIR)/boinc_client-language.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-language.obj `if test -f '../lib/language.C'; then $(CYGPATH_W) '../lib/language.C'; else $(CYGPATH_W) '$(srcdir)/../lib/language.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-language.Tpo" "$(DEPDIR)/boinc_client-language.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-language.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/language.C' object='boinc_client-language.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-language.Po' tmpdepfile='$(DEPDIR)/boinc_client-language.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-language.obj `if test -f '../lib/language.C'; then $(CYGPATH_W) '../lib/language.C'; else $(CYGPATH_W) '$(srcdir)/../lib/language.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-language.obj `if test -f '../lib/language.C'; then $(CYGPATH_W) '../lib/language.C'; else $(CYGPATH_W) '$(srcdir)/../lib/language.C'; fi`
 
 boinc_client-parse.o: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-parse.o -MD -MP -MF "$(DEPDIR)/boinc_client-parse.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-parse.o `test -f '../lib/parse.C' || echo '$(srcdir)/'`../lib/parse.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-parse.Tpo" "$(DEPDIR)/boinc_client-parse.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-parse.Tpo" "$(DEPDIR)/boinc_client-parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='boinc_client-parse.o' libtool=no @AMDEPBACKSLASH@
@@ -1064,19 +1032,19 @@ boinc_client-parse.o: ../lib/parse.C
 
 boinc_client-parse.obj: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-parse.obj -MD -MP -MF "$(DEPDIR)/boinc_client-parse.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-parse.Tpo" "$(DEPDIR)/boinc_client-parse.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-parse.Tpo" "$(DEPDIR)/boinc_client-parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='boinc_client-parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-parse.Po' tmpdepfile='$(DEPDIR)/boinc_client-parse.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`
 
 boinc_client-shmem.o: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-shmem.o -MD -MP -MF "$(DEPDIR)/boinc_client-shmem.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-shmem.o `test -f '../lib/shmem.C' || echo '$(srcdir)/'`../lib/shmem.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-shmem.Tpo" "$(DEPDIR)/boinc_client-shmem.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-shmem.Tpo" "$(DEPDIR)/boinc_client-shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='boinc_client-shmem.o' libtool=no @AMDEPBACKSLASH@
@@ -1086,19 +1054,19 @@ boinc_client-shmem.o: ../lib/shmem.C
 
 boinc_client-shmem.obj: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-shmem.obj -MD -MP -MF "$(DEPDIR)/boinc_client-shmem.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-shmem.Tpo" "$(DEPDIR)/boinc_client-shmem.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-shmem.Tpo" "$(DEPDIR)/boinc_client-shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='boinc_client-shmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-shmem.Po' tmpdepfile='$(DEPDIR)/boinc_client-shmem.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`
 
 boinc_client-md5_file.o: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-md5_file.o -MD -MP -MF "$(DEPDIR)/boinc_client-md5_file.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-md5_file.o `test -f '../lib/md5_file.C' || echo '$(srcdir)/'`../lib/md5_file.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-md5_file.Tpo" "$(DEPDIR)/boinc_client-md5_file.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-md5_file.Tpo" "$(DEPDIR)/boinc_client-md5_file.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-md5_file.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/md5_file.C' object='boinc_client-md5_file.o' libtool=no @AMDEPBACKSLASH@
@@ -1108,19 +1076,19 @@ boinc_client-md5_file.o: ../lib/md5_file.C
 
 boinc_client-md5_file.obj: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-md5_file.obj -MD -MP -MF "$(DEPDIR)/boinc_client-md5_file.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-md5_file.Tpo" "$(DEPDIR)/boinc_client-md5_file.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-md5_file.Tpo" "$(DEPDIR)/boinc_client-md5_file.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-md5_file.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/md5_file.C' object='boinc_client-md5_file.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-md5_file.Po' tmpdepfile='$(DEPDIR)/boinc_client-md5_file.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'; fi`
 
 boinc_client-crypt.o: ../lib/crypt.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-crypt.o -MD -MP -MF "$(DEPDIR)/boinc_client-crypt.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-crypt.o `test -f '../lib/crypt.C' || echo '$(srcdir)/'`../lib/crypt.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-crypt.Tpo" "$(DEPDIR)/boinc_client-crypt.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-crypt.Tpo" "$(DEPDIR)/boinc_client-crypt.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-crypt.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/crypt.C' object='boinc_client-crypt.o' libtool=no @AMDEPBACKSLASH@
@@ -1130,19 +1098,19 @@ boinc_client-crypt.o: ../lib/crypt.C
 
 boinc_client-crypt.obj: ../lib/crypt.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-crypt.obj -MD -MP -MF "$(DEPDIR)/boinc_client-crypt.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-crypt.Tpo" "$(DEPDIR)/boinc_client-crypt.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-crypt.Tpo" "$(DEPDIR)/boinc_client-crypt.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-crypt.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/crypt.C' object='boinc_client-crypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-crypt.Po' tmpdepfile='$(DEPDIR)/boinc_client-crypt.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'; fi`
 
 boinc_client-util.o: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-util.o -MD -MP -MF "$(DEPDIR)/boinc_client-util.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-util.o `test -f '../lib/util.C' || echo '$(srcdir)/'`../lib/util.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-util.Tpo" "$(DEPDIR)/boinc_client-util.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-util.Tpo" "$(DEPDIR)/boinc_client-util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='boinc_client-util.o' libtool=no @AMDEPBACKSLASH@
@@ -1152,19 +1120,19 @@ boinc_client-util.o: ../lib/util.C
 
 boinc_client-util.obj: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-util.obj -MD -MP -MF "$(DEPDIR)/boinc_client-util.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-util.Tpo" "$(DEPDIR)/boinc_client-util.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-util.Tpo" "$(DEPDIR)/boinc_client-util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='boinc_client-util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-util.Po' tmpdepfile='$(DEPDIR)/boinc_client-util.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`
 
 boinc_client-messages.o: ../lib/messages.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-messages.o -MD -MP -MF "$(DEPDIR)/boinc_client-messages.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-messages.o `test -f '../lib/messages.C' || echo '$(srcdir)/'`../lib/messages.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-messages.Tpo" "$(DEPDIR)/boinc_client-messages.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-messages.Tpo" "$(DEPDIR)/boinc_client-messages.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-messages.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/messages.C' object='boinc_client-messages.o' libtool=no @AMDEPBACKSLASH@
@@ -1174,19 +1142,19 @@ boinc_client-messages.o: ../lib/messages.C
 
 boinc_client-messages.obj: ../lib/messages.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-messages.obj -MD -MP -MF "$(DEPDIR)/boinc_client-messages.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-messages.Tpo" "$(DEPDIR)/boinc_client-messages.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-messages.Tpo" "$(DEPDIR)/boinc_client-messages.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-messages.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/messages.C' object='boinc_client-messages.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-messages.Po' tmpdepfile='$(DEPDIR)/boinc_client-messages.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'; fi`
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -1196,19 +1164,19 @@ boinc_client-messages.obj: ../lib/messages.C
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 boinc_client-md5.o: ../lib/md5.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT boinc_client-md5.o -MD -MP -MF "$(DEPDIR)/boinc_client-md5.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o boinc_client-md5.o `test -f '../lib/md5.c' || echo '$(srcdir)/'`../lib/md5.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/boinc_client-md5.Tpo" "$(DEPDIR)/boinc_client-md5.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/boinc_client-md5.Tpo" "$(DEPDIR)/boinc_client-md5.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/boinc_client-md5.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/md5.c' object='boinc_client-md5.o' libtool=no @AMDEPBACKSLASH@
@@ -1218,14 +1186,14 @@ boinc_client-md5.o: ../lib/md5.c
 
 boinc_client-md5.obj: ../lib/md5.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT boinc_client-md5.obj -MD -MP -MF "$(DEPDIR)/boinc_client-md5.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o boinc_client-md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/boinc_client-md5.Tpo" "$(DEPDIR)/boinc_client-md5.Po"; \
+@am__fastdepCC_TRUE@	  -c -o boinc_client-md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/boinc_client-md5.Tpo" "$(DEPDIR)/boinc_client-md5.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/boinc_client-md5.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/md5.c' object='boinc_client-md5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/boinc_client-md5.Po' tmpdepfile='$(DEPDIR)/boinc_client-md5.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o boinc_client-md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o boinc_client-md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -1287,11 +1255,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir) $(distdir)/mac $(distdir)/translation $(distdir)/win $(distdir)/win/res
+	$(mkinstalldirs) $(distdir)/.. $(distdir)/mac $(distdir)/translation $(distdir)/win $(distdir)/win/res
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -1318,7 +1288,6 @@ all-am: Makefile $(PROGRAMS) all-local
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/configure b/configure
index 47fb0c21f5..60dd5fe05d 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.33 .
+# From configure.ac Revision: 1.34 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for BOINC 1.11.
+# Generated by GNU Autoconf 2.57 for BOINC 1.12.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -287,8 +287,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='BOINC'
 PACKAGE_TARNAME='boinc'
-PACKAGE_VERSION='1.11'
-PACKAGE_STRING='BOINC 1.11'
+PACKAGE_VERSION='1.12'
+PACKAGE_STRING='BOINC 1.12'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="lib/shmem.C"
@@ -329,7 +329,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAJOR_VERSION MINOR_VERSION BUILD_TOP_DIR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS MYSQL_CONFIG MYSQL_LIBS MYSQL_CFLAGS EGREP CLIENT_BIN_FILENAME STATIC_FLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAJOR_VERSION MINOR_VERSION BUILD_TOP_DIR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS MYSQL_CONFIG MYSQL_LIBS MYSQL_CFLAGS EGREP CLIENT_BIN_FILENAME STATIC_FLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -810,7 +810,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures BOINC 1.11 to adapt to many kinds of systems.
+\`configure' configures BOINC 1.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -877,7 +877,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BOINC 1.11:";;
+     short | recursive ) echo "Configuration of BOINC 1.12:";;
    esac
   cat <<\_ACEOF
 
@@ -967,7 +967,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-BOINC configure 1.11
+BOINC configure 1.12
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1002,7 +1002,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by BOINC $as_me 1.11, which was
+It was created by BOINC $as_me 1.12, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -1179,7 +1179,7 @@ _ASBOX
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1339,7 +1339,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-echo "--- Configuring BOINC 1.11 ---"
+echo "--- Configuring BOINC 1.12 ---"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1668,6 +1668,15 @@ echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
  # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -1687,8 +1696,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=boinc
- VERSION=1.11
+ PACKAGE='boinc'
+ VERSION='1.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1821,9 +1830,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
-MAJOR_VERSION=`echo 1.11 | sed 's/\..*//'`
+MAJOR_VERSION=`echo 1.12 | sed 's/\..*//'`
 
-MINOR_VERSION=`echo 1.11 | sed 's/.*\.0*//'`
+MINOR_VERSION=`echo 1.12 | sed 's/.*\.0*//'`
 
 
 
@@ -2640,8 +2649,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2655,8 +2663,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -2739,24 +2747,16 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-
+DEPDIR="${am__leading_dot}deps"
 
           ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -2831,18 +2831,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -2860,13 +2874,20 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_CC_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -3120,8 +3141,7 @@ else
   fi
 fi
 for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -3135,8 +3155,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -3232,18 +3252,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CXX_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -3261,13 +3295,20 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_CXX_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -5155,7 +5196,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -5823,7 +5864,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_func_wait3_rusage=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_wait3_rusage" >&5
@@ -6303,7 +6344,7 @@ _ACEOF
 fi
 
 
-CLIENT_BIN_FILENAME=boinc_1.11_$host${EXEEXT}
+CLIENT_BIN_FILENAME=boinc_1.12_$host${EXEEXT}
 
 
 # by default, create static binaries on linux.
@@ -6707,7 +6748,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by BOINC $as_me 1.11, which was
+This file was extended by BOINC $as_me 1.12, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6770,7 +6811,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-BOINC config.status 1.11
+BOINC config.status 1.12
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7012,6 +7053,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
+s,@am__leading_dot@,$am__leading_dot,;t t
 s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
 s,@MINOR_VERSION@,$MINOR_VERSION,;t t
 s,@BUILD_TOP_DIR@,$BUILD_TOP_DIR,;t t
@@ -7479,7 +7521,16 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
-_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $ac_file | $ac_file:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
 echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
          X$ac_file : 'X\(//\)[^/]' \| \
diff --git a/configure.ac b/configure.ac
index 899c41398d..0cd5133909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl not sure exactly what the minimum version is (but 2.13 won't work)
 AC_PREREQ(2.57)
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(BOINC, 1.11)
+AC_INIT(BOINC, 1.12)
 
 echo "--- Configuring BOINC AC_PACKAGE_VERSION ---"
 
diff --git a/db/Makefile.in b/db/Makefile.in
index 003e4860ef..00565f36b7 100644
--- a/db/Makefile.in
+++ b/db/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -107,6 +107,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -142,6 +143,7 @@ target_vendor = @target_vendor@
 
 EXTRA_DIST = *.sql *.h init_db
 subdir = db
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -169,9 +171,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -197,7 +201,6 @@ check: check-am
 all-am: Makefile
 
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/lib/Makefile.in b/lib/Makefile.in
index a4d8165953..057a6b24fb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -208,6 +209,7 @@ crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C
 crypt_prog_DEPENDENCIES = $(LIBRSA)
 crypt_prog_LDADD = $(RSA_LIBS)
 subdir = lib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -295,10 +297,6 @@ AR = ar
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-boinc_api.$(OBJEXT): ../api/boinc_api.C
-graphics_api.$(OBJEXT): ../api/graphics_api.C
-graphics_data.$(OBJEXT): ../api/graphics_data.C
-mfile.$(OBJEXT): ../api/mfile.C
 libboinc.a: $(libboinc_a_OBJECTS) $(libboinc_a_DEPENDENCIES) 
 	-rm -f libboinc.a
 	$(libboinc_a_AR) libboinc.a $(libboinc_a_OBJECTS) $(libboinc_a_LIBADD)
@@ -377,7 +375,7 @@ distclean-depend:
 .C.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -387,19 +385,19 @@ distclean-depend:
 
 .C.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 boinc_api.o: ../api/boinc_api.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_api.o -MD -MP -MF "$(DEPDIR)/boinc_api.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_api.o `test -f '../api/boinc_api.C' || echo '$(srcdir)/'`../api/boinc_api.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_api.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/boinc_api.C' object='boinc_api.o' libtool=no @AMDEPBACKSLASH@
@@ -409,19 +407,19 @@ boinc_api.o: ../api/boinc_api.C
 
 boinc_api.obj: ../api/boinc_api.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_api.obj -MD -MP -MF "$(DEPDIR)/boinc_api.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_api.Tpo" "$(DEPDIR)/boinc_api.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_api.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/boinc_api.C' object='boinc_api.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_api.Po' tmpdepfile='$(DEPDIR)/boinc_api.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_api.obj `if test -f '../api/boinc_api.C'; then $(CYGPATH_W) '../api/boinc_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/boinc_api.C'; fi`
 
 graphics_api.o: ../api/graphics_api.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_api.o -MD -MP -MF "$(DEPDIR)/graphics_api.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o graphics_api.o `test -f '../api/graphics_api.C' || echo '$(srcdir)/'`../api/graphics_api.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/graphics_api.Tpo" "$(DEPDIR)/graphics_api.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/graphics_api.Tpo" "$(DEPDIR)/graphics_api.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/graphics_api.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/graphics_api.C' object='graphics_api.o' libtool=no @AMDEPBACKSLASH@
@@ -431,19 +429,19 @@ graphics_api.o: ../api/graphics_api.C
 
 graphics_api.obj: ../api/graphics_api.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_api.obj -MD -MP -MF "$(DEPDIR)/graphics_api.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o graphics_api.obj `if test -f '../api/graphics_api.C'; then $(CYGPATH_W) '../api/graphics_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_api.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/graphics_api.Tpo" "$(DEPDIR)/graphics_api.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o graphics_api.obj `if test -f '../api/graphics_api.C'; then $(CYGPATH_W) '../api/graphics_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_api.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/graphics_api.Tpo" "$(DEPDIR)/graphics_api.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/graphics_api.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/graphics_api.C' object='graphics_api.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/graphics_api.Po' tmpdepfile='$(DEPDIR)/graphics_api.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_api.obj `if test -f '../api/graphics_api.C'; then $(CYGPATH_W) '../api/graphics_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_api.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_api.obj `if test -f '../api/graphics_api.C'; then $(CYGPATH_W) '../api/graphics_api.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_api.C'; fi`
 
 graphics_data.o: ../api/graphics_data.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_data.o -MD -MP -MF "$(DEPDIR)/graphics_data.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o graphics_data.o `test -f '../api/graphics_data.C' || echo '$(srcdir)/'`../api/graphics_data.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/graphics_data.Tpo" "$(DEPDIR)/graphics_data.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/graphics_data.Tpo" "$(DEPDIR)/graphics_data.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/graphics_data.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/graphics_data.C' object='graphics_data.o' libtool=no @AMDEPBACKSLASH@
@@ -453,19 +451,19 @@ graphics_data.o: ../api/graphics_data.C
 
 graphics_data.obj: ../api/graphics_data.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_data.obj -MD -MP -MF "$(DEPDIR)/graphics_data.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o graphics_data.obj `if test -f '../api/graphics_data.C'; then $(CYGPATH_W) '../api/graphics_data.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_data.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/graphics_data.Tpo" "$(DEPDIR)/graphics_data.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o graphics_data.obj `if test -f '../api/graphics_data.C'; then $(CYGPATH_W) '../api/graphics_data.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_data.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/graphics_data.Tpo" "$(DEPDIR)/graphics_data.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/graphics_data.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/graphics_data.C' object='graphics_data.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/graphics_data.Po' tmpdepfile='$(DEPDIR)/graphics_data.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_data.obj `if test -f '../api/graphics_data.C'; then $(CYGPATH_W) '../api/graphics_data.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_data.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_data.obj `if test -f '../api/graphics_data.C'; then $(CYGPATH_W) '../api/graphics_data.C'; else $(CYGPATH_W) '$(srcdir)/../api/graphics_data.C'; fi`
 
 mfile.o: ../api/mfile.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mfile.o -MD -MP -MF "$(DEPDIR)/mfile.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o mfile.o `test -f '../api/mfile.C' || echo '$(srcdir)/'`../api/mfile.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/mfile.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/mfile.C' object='mfile.o' libtool=no @AMDEPBACKSLASH@
@@ -475,19 +473,19 @@ mfile.o: ../api/mfile.C
 
 mfile.obj: ../api/mfile.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mfile.obj -MD -MP -MF "$(DEPDIR)/mfile.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mfile.Tpo" "$(DEPDIR)/mfile.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/mfile.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../api/mfile.C' object='mfile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/mfile.Po' tmpdepfile='$(DEPDIR)/mfile.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mfile.obj `if test -f '../api/mfile.C'; then $(CYGPATH_W) '../api/mfile.C'; else $(CYGPATH_W) '$(srcdir)/../api/mfile.C'; fi`
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -497,14 +495,14 @@ mfile.obj: ../api/mfile.C
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -566,11 +564,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -597,7 +597,6 @@ all-am: Makefile $(LIBRARIES) $(PROGRAMS)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/py/Makefile.in b/py/Makefile.in
index d4f5303bf5..bb50f44fd2 100644
--- a/py/Makefile.in
+++ b/py/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -168,6 +169,7 @@ LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a
 
 EXTRA_DIST = boinc.py boinc_db.py version.py.in db_def_to_py
 subdir = py
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.py
@@ -197,11 +199,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -227,7 +231,6 @@ check: check-am
 all-am: Makefile
 
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/sched/Makefile.in b/sched/Makefile.in
index 7866d82d1c..2f00af2196 100644
--- a/sched/Makefile.in
+++ b/sched/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -263,6 +264,7 @@ fcgi_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
 fcgi_CPPFLAGS = -include /usr/local/include/fcgi_stdio.h -D_USING_FCGI_ $(AM_CPPFLAGS)
 fcgi_LDADD = $(LDADD) $(RSA_LIBS) -lfcgi -lfcgi++ $(MYSQL_LIBS)
 subdir = sched
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -403,16 +405,6 @@ AR = ar
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-boinc_db.$(OBJEXT): ../db/boinc_db.C
-util.$(OBJEXT): ../lib/util.C
-crypt.$(OBJEXT): ../lib/crypt.C
-parse.$(OBJEXT): ../lib/parse.C
-shmem.$(OBJEXT): ../lib/shmem.C
-md5.$(OBJEXT): ../lib/md5.c
-md5_file.$(OBJEXT): ../lib/md5_file.C
-messages.$(OBJEXT): ../lib/messages.C
-process_result_template.$(OBJEXT): ../tools/process_result_template.C
-backend_lib.$(OBJEXT): ../tools/backend_lib.C
 libsched.a: $(libsched_a_OBJECTS) $(libsched_a_DEPENDENCIES) 
 	-rm -f libsched.a
 	$(libsched_a_AR) libsched.a $(libsched_a_OBJECTS) $(libsched_a_LIBADD)
@@ -429,9 +421,6 @@ cgi$(EXEEXT): $(cgi_OBJECTS) $(cgi_DEPENDENCIES)
 db_dump$(EXEEXT): $(db_dump_OBJECTS) $(db_dump_DEPENDENCIES) 
 	@rm -f db_dump$(EXEEXT)
 	$(CXXLINK) $(db_dump_LDFLAGS) $(db_dump_OBJECTS) $(db_dump_LDADD) $(LIBS)
-fcgi-handle_request.$(OBJEXT): handle_request.C
-fcgi-main.$(OBJEXT): main.C
-fcgi-server_types.$(OBJEXT): server_types.C
 fcgi$(EXEEXT): $(fcgi_OBJECTS) $(fcgi_DEPENDENCIES) 
 	@rm -f fcgi$(EXEEXT)
 	$(CXXLINK) $(fcgi_LDFLAGS) $(fcgi_OBJECTS) $(fcgi_LDADD) $(LIBS)
@@ -530,7 +519,7 @@ distclean-depend:
 .C.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -540,19 +529,19 @@ distclean-depend:
 
 .C.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 boinc_db.o: ../db/boinc_db.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_db.o -MD -MP -MF "$(DEPDIR)/boinc_db.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_db.o `test -f '../db/boinc_db.C' || echo '$(srcdir)/'`../db/boinc_db.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_db.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../db/boinc_db.C' object='boinc_db.o' libtool=no @AMDEPBACKSLASH@
@@ -562,19 +551,19 @@ boinc_db.o: ../db/boinc_db.C
 
 boinc_db.obj: ../db/boinc_db.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_db.obj -MD -MP -MF "$(DEPDIR)/boinc_db.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_db.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../db/boinc_db.C' object='boinc_db.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_db.Po' tmpdepfile='$(DEPDIR)/boinc_db.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'; fi`
 
 util.o: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.o -MD -MP -MF "$(DEPDIR)/util.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o util.o `test -f '../lib/util.C' || echo '$(srcdir)/'`../lib/util.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.o' libtool=no @AMDEPBACKSLASH@
@@ -584,19 +573,19 @@ util.o: ../lib/util.C
 
 util.obj: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.obj -MD -MP -MF "$(DEPDIR)/util.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/util.Po' tmpdepfile='$(DEPDIR)/util.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`
 
 crypt.o: ../lib/crypt.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crypt.o -MD -MP -MF "$(DEPDIR)/crypt.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o crypt.o `test -f '../lib/crypt.C' || echo '$(srcdir)/'`../lib/crypt.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/crypt.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/crypt.C' object='crypt.o' libtool=no @AMDEPBACKSLASH@
@@ -606,19 +595,19 @@ crypt.o: ../lib/crypt.C
 
 crypt.obj: ../lib/crypt.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crypt.obj -MD -MP -MF "$(DEPDIR)/crypt.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/crypt.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/crypt.C' object='crypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/crypt.Po' tmpdepfile='$(DEPDIR)/crypt.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'; fi`
 
 parse.o: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.o -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o parse.o `test -f '../lib/parse.C' || echo '$(srcdir)/'`../lib/parse.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.o' libtool=no @AMDEPBACKSLASH@
@@ -628,19 +617,19 @@ parse.o: ../lib/parse.C
 
 parse.obj: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.obj -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/parse.Po' tmpdepfile='$(DEPDIR)/parse.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`
 
 shmem.o: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shmem.o -MD -MP -MF "$(DEPDIR)/shmem.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o shmem.o `test -f '../lib/shmem.C' || echo '$(srcdir)/'`../lib/shmem.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='shmem.o' libtool=no @AMDEPBACKSLASH@
@@ -650,19 +639,19 @@ shmem.o: ../lib/shmem.C
 
 shmem.obj: ../lib/shmem.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shmem.obj -MD -MP -MF "$(DEPDIR)/shmem.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shmem.Tpo" "$(DEPDIR)/shmem.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/shmem.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/shmem.C' object='shmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/shmem.Po' tmpdepfile='$(DEPDIR)/shmem.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'; fi`
 
 md5_file.o: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5_file.o -MD -MP -MF "$(DEPDIR)/md5_file.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o md5_file.o `test -f '../lib/md5_file.C' || echo '$(srcdir)/'`../lib/md5_file.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/md5_file.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/md5_file.C' object='md5_file.o' libtool=no @AMDEPBACKSLASH@
@@ -672,19 +661,19 @@ md5_file.o: ../lib/md5_file.C
 
 md5_file.obj: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5_file.obj -MD -MP -MF "$(DEPDIR)/md5_file.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/md5_file.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/md5_file.C' object='md5_file.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/md5_file.Po' tmpdepfile='$(DEPDIR)/md5_file.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'; fi`
 
 messages.o: ../lib/messages.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT messages.o -MD -MP -MF "$(DEPDIR)/messages.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o messages.o `test -f '../lib/messages.C' || echo '$(srcdir)/'`../lib/messages.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/messages.Tpo" "$(DEPDIR)/messages.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/messages.Tpo" "$(DEPDIR)/messages.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/messages.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/messages.C' object='messages.o' libtool=no @AMDEPBACKSLASH@
@@ -694,19 +683,19 @@ messages.o: ../lib/messages.C
 
 messages.obj: ../lib/messages.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT messages.obj -MD -MP -MF "$(DEPDIR)/messages.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/messages.Tpo" "$(DEPDIR)/messages.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/messages.Tpo" "$(DEPDIR)/messages.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/messages.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/messages.C' object='messages.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/messages.Po' tmpdepfile='$(DEPDIR)/messages.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o messages.obj `if test -f '../lib/messages.C'; then $(CYGPATH_W) '../lib/messages.C'; else $(CYGPATH_W) '$(srcdir)/../lib/messages.C'; fi`
 
 process_result_template.o: ../tools/process_result_template.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT process_result_template.o -MD -MP -MF "$(DEPDIR)/process_result_template.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o process_result_template.o `test -f '../tools/process_result_template.C' || echo '$(srcdir)/'`../tools/process_result_template.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/process_result_template.Tpo" "$(DEPDIR)/process_result_template.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/process_result_template.Tpo" "$(DEPDIR)/process_result_template.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/process_result_template.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../tools/process_result_template.C' object='process_result_template.o' libtool=no @AMDEPBACKSLASH@
@@ -716,19 +705,19 @@ process_result_template.o: ../tools/process_result_template.C
 
 process_result_template.obj: ../tools/process_result_template.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT process_result_template.obj -MD -MP -MF "$(DEPDIR)/process_result_template.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o process_result_template.obj `if test -f '../tools/process_result_template.C'; then $(CYGPATH_W) '../tools/process_result_template.C'; else $(CYGPATH_W) '$(srcdir)/../tools/process_result_template.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/process_result_template.Tpo" "$(DEPDIR)/process_result_template.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o process_result_template.obj `if test -f '../tools/process_result_template.C'; then $(CYGPATH_W) '../tools/process_result_template.C'; else $(CYGPATH_W) '$(srcdir)/../tools/process_result_template.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/process_result_template.Tpo" "$(DEPDIR)/process_result_template.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/process_result_template.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../tools/process_result_template.C' object='process_result_template.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/process_result_template.Po' tmpdepfile='$(DEPDIR)/process_result_template.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o process_result_template.obj `if test -f '../tools/process_result_template.C'; then $(CYGPATH_W) '../tools/process_result_template.C'; else $(CYGPATH_W) '$(srcdir)/../tools/process_result_template.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o process_result_template.obj `if test -f '../tools/process_result_template.C'; then $(CYGPATH_W) '../tools/process_result_template.C'; else $(CYGPATH_W) '$(srcdir)/../tools/process_result_template.C'; fi`
 
 backend_lib.o: ../tools/backend_lib.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT backend_lib.o -MD -MP -MF "$(DEPDIR)/backend_lib.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o backend_lib.o `test -f '../tools/backend_lib.C' || echo '$(srcdir)/'`../tools/backend_lib.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/backend_lib.Tpo" "$(DEPDIR)/backend_lib.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/backend_lib.Tpo" "$(DEPDIR)/backend_lib.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/backend_lib.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../tools/backend_lib.C' object='backend_lib.o' libtool=no @AMDEPBACKSLASH@
@@ -738,19 +727,19 @@ backend_lib.o: ../tools/backend_lib.C
 
 backend_lib.obj: ../tools/backend_lib.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT backend_lib.obj -MD -MP -MF "$(DEPDIR)/backend_lib.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o backend_lib.obj `if test -f '../tools/backend_lib.C'; then $(CYGPATH_W) '../tools/backend_lib.C'; else $(CYGPATH_W) '$(srcdir)/../tools/backend_lib.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/backend_lib.Tpo" "$(DEPDIR)/backend_lib.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o backend_lib.obj `if test -f '../tools/backend_lib.C'; then $(CYGPATH_W) '../tools/backend_lib.C'; else $(CYGPATH_W) '$(srcdir)/../tools/backend_lib.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/backend_lib.Tpo" "$(DEPDIR)/backend_lib.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/backend_lib.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../tools/backend_lib.C' object='backend_lib.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/backend_lib.Po' tmpdepfile='$(DEPDIR)/backend_lib.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o backend_lib.obj `if test -f '../tools/backend_lib.C'; then $(CYGPATH_W) '../tools/backend_lib.C'; else $(CYGPATH_W) '$(srcdir)/../tools/backend_lib.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o backend_lib.obj `if test -f '../tools/backend_lib.C'; then $(CYGPATH_W) '../tools/backend_lib.C'; else $(CYGPATH_W) '$(srcdir)/../tools/backend_lib.C'; fi`
 
 fcgi-handle_request.o: handle_request.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fcgi-handle_request.o -MD -MP -MF "$(DEPDIR)/fcgi-handle_request.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o fcgi-handle_request.o `test -f 'handle_request.C' || echo '$(srcdir)/'`handle_request.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/fcgi-handle_request.Tpo" "$(DEPDIR)/fcgi-handle_request.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fcgi-handle_request.Tpo" "$(DEPDIR)/fcgi-handle_request.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/fcgi-handle_request.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='handle_request.C' object='fcgi-handle_request.o' libtool=no @AMDEPBACKSLASH@
@@ -760,19 +749,19 @@ fcgi-handle_request.o: handle_request.C
 
 fcgi-handle_request.obj: handle_request.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fcgi-handle_request.obj -MD -MP -MF "$(DEPDIR)/fcgi-handle_request.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o fcgi-handle_request.obj `if test -f 'handle_request.C'; then $(CYGPATH_W) 'handle_request.C'; else $(CYGPATH_W) '$(srcdir)/handle_request.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/fcgi-handle_request.Tpo" "$(DEPDIR)/fcgi-handle_request.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o fcgi-handle_request.obj `if test -f 'handle_request.C'; then $(CYGPATH_W) 'handle_request.C'; else $(CYGPATH_W) '$(srcdir)/handle_request.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fcgi-handle_request.Tpo" "$(DEPDIR)/fcgi-handle_request.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/fcgi-handle_request.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='handle_request.C' object='fcgi-handle_request.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/fcgi-handle_request.Po' tmpdepfile='$(DEPDIR)/fcgi-handle_request.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fcgi-handle_request.obj `if test -f 'handle_request.C'; then $(CYGPATH_W) 'handle_request.C'; else $(CYGPATH_W) '$(srcdir)/handle_request.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fcgi-handle_request.obj `if test -f 'handle_request.C'; then $(CYGPATH_W) 'handle_request.C'; else $(CYGPATH_W) '$(srcdir)/handle_request.C'; fi`
 
 fcgi-main.o: main.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fcgi-main.o -MD -MP -MF "$(DEPDIR)/fcgi-main.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o fcgi-main.o `test -f 'main.C' || echo '$(srcdir)/'`main.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/fcgi-main.Tpo" "$(DEPDIR)/fcgi-main.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fcgi-main.Tpo" "$(DEPDIR)/fcgi-main.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/fcgi-main.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.C' object='fcgi-main.o' libtool=no @AMDEPBACKSLASH@
@@ -782,19 +771,19 @@ fcgi-main.o: main.C
 
 fcgi-main.obj: main.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fcgi-main.obj -MD -MP -MF "$(DEPDIR)/fcgi-main.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o fcgi-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/fcgi-main.Tpo" "$(DEPDIR)/fcgi-main.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o fcgi-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fcgi-main.Tpo" "$(DEPDIR)/fcgi-main.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/fcgi-main.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.C' object='fcgi-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/fcgi-main.Po' tmpdepfile='$(DEPDIR)/fcgi-main.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fcgi-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fcgi-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'; fi`
 
 fcgi-server_types.o: server_types.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fcgi-server_types.o -MD -MP -MF "$(DEPDIR)/fcgi-server_types.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o fcgi-server_types.o `test -f 'server_types.C' || echo '$(srcdir)/'`server_types.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/fcgi-server_types.Tpo" "$(DEPDIR)/fcgi-server_types.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fcgi-server_types.Tpo" "$(DEPDIR)/fcgi-server_types.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/fcgi-server_types.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='server_types.C' object='fcgi-server_types.o' libtool=no @AMDEPBACKSLASH@
@@ -804,19 +793,19 @@ fcgi-server_types.o: server_types.C
 
 fcgi-server_types.obj: server_types.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fcgi-server_types.obj -MD -MP -MF "$(DEPDIR)/fcgi-server_types.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o fcgi-server_types.obj `if test -f 'server_types.C'; then $(CYGPATH_W) 'server_types.C'; else $(CYGPATH_W) '$(srcdir)/server_types.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/fcgi-server_types.Tpo" "$(DEPDIR)/fcgi-server_types.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o fcgi-server_types.obj `if test -f 'server_types.C'; then $(CYGPATH_W) 'server_types.C'; else $(CYGPATH_W) '$(srcdir)/server_types.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fcgi-server_types.Tpo" "$(DEPDIR)/fcgi-server_types.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/fcgi-server_types.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='server_types.C' object='fcgi-server_types.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/fcgi-server_types.Po' tmpdepfile='$(DEPDIR)/fcgi-server_types.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fcgi-server_types.obj `if test -f 'server_types.C'; then $(CYGPATH_W) 'server_types.C'; else $(CYGPATH_W) '$(srcdir)/server_types.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fcgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fcgi-server_types.obj `if test -f 'server_types.C'; then $(CYGPATH_W) 'server_types.C'; else $(CYGPATH_W) '$(srcdir)/server_types.C'; fi`
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -826,19 +815,19 @@ fcgi-server_types.obj: server_types.C
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 md5.o: ../lib/md5.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF "$(DEPDIR)/md5.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o md5.o `test -f '../lib/md5.c' || echo '$(srcdir)/'`../lib/md5.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
@@ -848,14 +837,14 @@ md5.o: ../lib/md5.c
 
 md5.obj: ../lib/md5.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF "$(DEPDIR)/md5.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
+@am__fastdepCC_TRUE@	  -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/md5.Po' tmpdepfile='$(DEPDIR)/md5.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -917,11 +906,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -948,7 +939,6 @@ all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/test/Makefile.in b/test/Makefile.in
index bc547eeaaa..f717cbebfe 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -187,6 +188,7 @@ EXTRA_DIST = \
 	test*.inc init.inc boinc_db.inc
 
 subdir = test
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.inc
@@ -289,11 +291,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -320,7 +324,6 @@ check: check-am
 all-am: Makefile
 
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/test/test_concat.py b/test/test_concat.py
index a438bd17ec..cbfdbc18d1 100755
--- a/test/test_concat.py
+++ b/test/test_concat.py
@@ -7,36 +7,39 @@
 from testbase import *
 
 class WorkConcat(Work):
-    def __init__(self, redundancy=2):
+    def __init__(self, redundancy, **kwargs):
         Work.__init__(self, redundancy=redundancy)
         self.wu_template = "concat_wu"
         self.result_template = "concat_result"
         self.input_files = ['input']*2
+        self.__dict__.update(kwargs)
 
 class ProjectConcat(TestProject):
-    def __init__(self, works=None, users=None, hosts=None, redundancy=2):
+    def __init__(self, works=None, users=None, hosts=None):
+        (num_wu, redundancy) = get_redundancy_args()
         TestProject.__init__(self,
                              appname = 'concat',
+                             num_wu=num_wu, redundancy=redundancy,
+                             expected_result = Result(),
                              works = works or [WorkConcat(redundancy=redundancy)],
                              users = users,
-                             hosts = hosts,
-                             redundancy=redundancy)
+                             hosts = hosts)
 
-    def check(self):
-        self.sched_run('validate_test')
-        result = {}
-        result['server_state'] = RESULT_SERVER_STATE_OVER
-        self.check_results(result)
-        self.check_files_match("upload/concat_wu_%d_0", "concat_correct_output", count=self.redundancy)
-        self.sched_run('assimilator')
-        self.sched_run('file_deleter')
-        self.check_deleted("download/input")
-        self.check_deleted("upload/concat_wu_%d_0", count=self.redundancy)
+    # def check(self):
+    #     self.sched_run('validate_test')
+    #     result = {}
+    #     result['server_state'] = RESULT_SERVER_STATE_OVER
+    #     self.check_results(result)
+    #     self.check_files_match("upload/concat_wu_%d_0", "concat_correct_output", count=self.redundancy)
+    #     self.sched_run('assimilator')
+    #     self.sched_run('file_deleter')
+    #     self.check_deleted("download/input")
+    #     self.check_deleted("upload/concat_wu_%d_0", count=self.redundancy)
 
-    def run(self):
-        self.install()
-        self.sched_install('feeder')
-        self.start_servers()
+    # def run(self):
+    #     self.install()
+    #     self.sched_install('feeder')
+    #     self.start_servers()
 
 if __name__ == '__main__':
     test_msg("standard concat application");
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 74100856fc..0ad827adb1 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,6 +110,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -206,6 +207,7 @@ add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
 
 country_select_SOURCES = country_select.C ../lib/countries.C
 subdir = tools
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -288,16 +290,9 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-md5_file.$(OBJEXT): ../lib/md5_file.C
-md5.$(OBJEXT): ../lib/md5.c
-parse.$(OBJEXT): ../lib/parse.C
-util.$(OBJEXT): ../lib/util.C
-boinc_db.$(OBJEXT): ../db/boinc_db.C
-crypt.$(OBJEXT): ../lib/crypt.C
 add$(EXEEXT): $(add_OBJECTS) $(add_DEPENDENCIES) 
 	@rm -f add$(EXEEXT)
 	$(CXXLINK) $(add_LDFLAGS) $(add_OBJECTS) $(add_LDADD) $(LIBS)
-countries.$(OBJEXT): ../lib/countries.C
 country_select$(EXEEXT): $(country_select_OBJECTS) $(country_select_DEPENDENCIES) 
 	@rm -f country_select$(EXEEXT)
 	$(CXXLINK) $(country_select_LDFLAGS) $(country_select_OBJECTS) $(country_select_LDADD) $(LIBS)
@@ -330,7 +325,7 @@ distclean-depend:
 .C.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -340,19 +335,19 @@ distclean-depend:
 
 .C.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 md5_file.o: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5_file.o -MD -MP -MF "$(DEPDIR)/md5_file.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o md5_file.o `test -f '../lib/md5_file.C' || echo '$(srcdir)/'`../lib/md5_file.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/md5_file.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/md5_file.C' object='md5_file.o' libtool=no @AMDEPBACKSLASH@
@@ -362,19 +357,19 @@ md5_file.o: ../lib/md5_file.C
 
 md5_file.obj: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5_file.obj -MD -MP -MF "$(DEPDIR)/md5_file.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/md5_file.Tpo" "$(DEPDIR)/md5_file.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/md5_file.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/md5_file.C' object='md5_file.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/md5_file.Po' tmpdepfile='$(DEPDIR)/md5_file.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md5_file.obj `if test -f '../lib/md5_file.C'; then $(CYGPATH_W) '../lib/md5_file.C'; else $(CYGPATH_W) '$(srcdir)/../lib/md5_file.C'; fi`
 
 parse.o: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.o -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o parse.o `test -f '../lib/parse.C' || echo '$(srcdir)/'`../lib/parse.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.o' libtool=no @AMDEPBACKSLASH@
@@ -384,19 +379,19 @@ parse.o: ../lib/parse.C
 
 parse.obj: ../lib/parse.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parse.obj -MD -MP -MF "$(DEPDIR)/parse.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse.Tpo" "$(DEPDIR)/parse.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/parse.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/parse.C' object='parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/parse.Po' tmpdepfile='$(DEPDIR)/parse.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parse.obj `if test -f '../lib/parse.C'; then $(CYGPATH_W) '../lib/parse.C'; else $(CYGPATH_W) '$(srcdir)/../lib/parse.C'; fi`
 
 util.o: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.o -MD -MP -MF "$(DEPDIR)/util.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o util.o `test -f '../lib/util.C' || echo '$(srcdir)/'`../lib/util.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.o' libtool=no @AMDEPBACKSLASH@
@@ -406,19 +401,19 @@ util.o: ../lib/util.C
 
 util.obj: ../lib/util.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT util.obj -MD -MP -MF "$(DEPDIR)/util.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util.Tpo" "$(DEPDIR)/util.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/util.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/util.C' object='util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/util.Po' tmpdepfile='$(DEPDIR)/util.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `if test -f '../lib/util.C'; then $(CYGPATH_W) '../lib/util.C'; else $(CYGPATH_W) '$(srcdir)/../lib/util.C'; fi`
 
 boinc_db.o: ../db/boinc_db.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_db.o -MD -MP -MF "$(DEPDIR)/boinc_db.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_db.o `test -f '../db/boinc_db.C' || echo '$(srcdir)/'`../db/boinc_db.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_db.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../db/boinc_db.C' object='boinc_db.o' libtool=no @AMDEPBACKSLASH@
@@ -428,19 +423,19 @@ boinc_db.o: ../db/boinc_db.C
 
 boinc_db.obj: ../db/boinc_db.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_db.obj -MD -MP -MF "$(DEPDIR)/boinc_db.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_db.Tpo" "$(DEPDIR)/boinc_db.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_db.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../db/boinc_db.C' object='boinc_db.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_db.Po' tmpdepfile='$(DEPDIR)/boinc_db.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_db.obj `if test -f '../db/boinc_db.C'; then $(CYGPATH_W) '../db/boinc_db.C'; else $(CYGPATH_W) '$(srcdir)/../db/boinc_db.C'; fi`
 
 crypt.o: ../lib/crypt.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crypt.o -MD -MP -MF "$(DEPDIR)/crypt.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o crypt.o `test -f '../lib/crypt.C' || echo '$(srcdir)/'`../lib/crypt.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/crypt.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/crypt.C' object='crypt.o' libtool=no @AMDEPBACKSLASH@
@@ -450,19 +445,19 @@ crypt.o: ../lib/crypt.C
 
 crypt.obj: ../lib/crypt.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crypt.obj -MD -MP -MF "$(DEPDIR)/crypt.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crypt.Tpo" "$(DEPDIR)/crypt.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/crypt.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/crypt.C' object='crypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/crypt.Po' tmpdepfile='$(DEPDIR)/crypt.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crypt.obj `if test -f '../lib/crypt.C'; then $(CYGPATH_W) '../lib/crypt.C'; else $(CYGPATH_W) '$(srcdir)/../lib/crypt.C'; fi`
 
 countries.o: ../lib/countries.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT countries.o -MD -MP -MF "$(DEPDIR)/countries.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o countries.o `test -f '../lib/countries.C' || echo '$(srcdir)/'`../lib/countries.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/countries.Tpo" "$(DEPDIR)/countries.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/countries.Tpo" "$(DEPDIR)/countries.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/countries.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/countries.C' object='countries.o' libtool=no @AMDEPBACKSLASH@
@@ -472,19 +467,19 @@ countries.o: ../lib/countries.C
 
 countries.obj: ../lib/countries.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT countries.obj -MD -MP -MF "$(DEPDIR)/countries.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o countries.obj `if test -f '../lib/countries.C'; then $(CYGPATH_W) '../lib/countries.C'; else $(CYGPATH_W) '$(srcdir)/../lib/countries.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/countries.Tpo" "$(DEPDIR)/countries.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o countries.obj `if test -f '../lib/countries.C'; then $(CYGPATH_W) '../lib/countries.C'; else $(CYGPATH_W) '$(srcdir)/../lib/countries.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/countries.Tpo" "$(DEPDIR)/countries.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/countries.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/countries.C' object='countries.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/countries.Po' tmpdepfile='$(DEPDIR)/countries.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o countries.obj `if test -f '../lib/countries.C'; then $(CYGPATH_W) '../lib/countries.C'; else $(CYGPATH_W) '$(srcdir)/../lib/countries.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o countries.obj `if test -f '../lib/countries.C'; then $(CYGPATH_W) '../lib/countries.C'; else $(CYGPATH_W) '$(srcdir)/../lib/countries.C'; fi`
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -494,19 +489,19 @@ countries.obj: ../lib/countries.C
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 md5.o: ../lib/md5.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF "$(DEPDIR)/md5.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o md5.o `test -f '../lib/md5.c' || echo '$(srcdir)/'`../lib/md5.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
@@ -516,14 +511,14 @@ md5.o: ../lib/md5.c
 
 md5.obj: ../lib/md5.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF "$(DEPDIR)/md5.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
+@am__fastdepCC_TRUE@	  -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/md5.Po' tmpdepfile='$(DEPDIR)/md5.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '../lib/md5.c'; then $(CYGPATH_W) '../lib/md5.c'; else $(CYGPATH_W) '$(srcdir)/../lib/md5.c'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -585,11 +580,13 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(top_srcdir)
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -616,7 +613,6 @@ all-am: Makefile $(PROGRAMS)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am