diff --git a/checkin_notes b/checkin_notes
index 7670960feb..3358d5f045 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10988,3 +10988,31 @@ David  Mar 26 2004
             forum.inc
         user/
             host_edit_action.php
+
+Eric H   Mar 26 2004
+    - added support for SOCKS4 and SOCKS5 proxy servers
+    - added a new PROXY layer between HTTP_OP and NET_XFER.  This layer takes care
+      of the state transitions involved in negotiating with a SOCKS server.  Since
+      the HTTP_OP is dependant on the completion of the proxy operation, I made
+      the layers synchronous (PROXY:poll() is called in HTTP_OP::poll() rather
+      than CLIENT_STATE::do_something()).  Support for editing SOCKS proxy server
+      information still needs to be completed in the Windows GUI.
+    - Possible future projects:  add IPv6 support, GSSAPI support, test on SOCKS4 server
+
+    client/
+        Makefile.am
+        client_messages.C
+        client_state.C,h
+        cs_cmdline.C
+        cs_statefile.C
+        gui_rpc_server.C
+        http.C,h
+        log_flags.C,h
+        message.h
+        net_xfer.C,h
+        pers_file_xfer.C
+        proxy.C,h (added)
+        scheduler_op.C
+    lib/
+        error_numbers.h
+
diff --git a/client/Makefile.am b/client/Makefile.am
index 48d0e3372e..607f6d6948 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -37,6 +37,7 @@ boinc_client_SOURCES =			\
     net_xfer.C					\
     pers_file_xfer.C			\
     prefs.C					    \
+    proxy.C					    \
     scheduler_op.C				\
     ss_logic.C					\
     time_stats.C				\
diff --git a/client/Makefile.in b/client/Makefile.in
index 113162adb7..c72aa0b689 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.9 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,
@@ -55,7 +55,6 @@ CLIENT_BIN_FILENAME = @CLIENT_BIN_FILENAME@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -66,7 +65,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GRXLIBS = @GRXLIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -82,10 +80,6 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MINOR_VERSION = @MINOR_VERSION@
-MYSQL_CFLAGS = @MYSQL_CFLAGS@
-MYSQL_CONFIG = @MYSQL_CONFIG@
-
-MYSQL_LIBS = @MYSQL_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -94,9 +88,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -113,6 +104,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@
@@ -146,6 +138,9 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
+MYSQL_LIBS = @MYSQL_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+
 RSA_LIBS = \
 	-L$(top_builddir)/RSAEuro/source				\
 	-lrsaeuro
@@ -205,6 +200,7 @@ boinc_client_SOURCES = \
     net_xfer.C					\
     pers_file_xfer.C			\
     prefs.C					    \
+    proxy.C					    \
     scheduler_op.C				\
     ss_logic.C					\
     time_stats.C				\
@@ -247,6 +243,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 =
@@ -277,7 +274,7 @@ am_boinc_client_OBJECTS = boinc_client-app.$(OBJEXT) \
 	boinc_client-net_stats.$(OBJEXT) \
 	boinc_client-net_xfer.$(OBJEXT) \
 	boinc_client-pers_file_xfer.$(OBJEXT) \
-	boinc_client-prefs.$(OBJEXT) \
+	boinc_client-prefs.$(OBJEXT) boinc_client-proxy.$(OBJEXT) \
 	boinc_client-scheduler_op.$(OBJEXT) \
 	boinc_client-ss_logic.$(OBJEXT) \
 	boinc_client-time_stats.$(OBJEXT) \
@@ -336,6 +333,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/boinc_client-parse.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/boinc_client-pers_file_xfer.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/boinc_client-prefs.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/boinc_client-proxy.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/boinc_client-scheduler_op.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/boinc_client-shmem.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/boinc_client-ss_logic.Po \
@@ -353,8 +351,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(boinc_client_SOURCES) $(cpu_benchmark_SOURCES)
-DIST_COMMON = $(top_srcdir)/Makefile.incl Makefile.am Makefile.in \
-	install-sh
+DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl \
+	Makefile.am install-sh
 SOURCES = $(boinc_client_SOURCES) $(cpu_benchmark_SOURCES)
 
 all: all-am
@@ -390,49 +388,6 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-boinc_client-app.$(OBJEXT): app.C
-boinc_client-check_state.$(OBJEXT): check_state.C
-boinc_client-client_messages.$(OBJEXT): client_messages.C
-boinc_client-client_state.$(OBJEXT): client_state.C
-boinc_client-client_types.$(OBJEXT): client_types.C
-boinc_client-cpu_benchmark.$(OBJEXT): cpu_benchmark.C
-boinc_client-cs_account.$(OBJEXT): cs_account.C
-boinc_client-cs_apps.$(OBJEXT): cs_apps.C
-boinc_client-cs_benchmark.$(OBJEXT): cs_benchmark.C
-boinc_client-cs_cmdline.$(OBJEXT): cs_cmdline.C
-boinc_client-cs_files.$(OBJEXT): cs_files.C
-boinc_client-cs_prefs.$(OBJEXT): cs_prefs.C
-boinc_client-cs_scheduler.$(OBJEXT): cs_scheduler.C
-boinc_client-cs_statefile.$(OBJEXT): cs_statefile.C
-boinc_client-file_names.$(OBJEXT): file_names.C
-boinc_client-file_xfer.$(OBJEXT): file_xfer.C
-boinc_client-gui_rpc_server.$(OBJEXT): gui_rpc_server.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-main.$(OBJEXT): main.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-ss_logic.$(OBJEXT): ss_logic.C
-boinc_client-time_stats.$(OBJEXT): time_stats.C
-boinc_client-app_ipc.$(OBJEXT): ../lib/app_ipc.C
-boinc_client-crypt.$(OBJEXT): ../lib/crypt.C
-boinc_client-diagnostics.$(OBJEXT): ../lib/diagnostics.C
-boinc_client-exception.$(OBJEXT): ../lib/exception.C
-boinc_client-filesys.$(OBJEXT): ../lib/filesys.C
-boinc_client-language.$(OBJEXT): ../lib/language.C
-boinc_client-md5_file.$(OBJEXT): ../lib/md5_file.C
-boinc_client-md5.$(OBJEXT): ../lib/md5.c
-boinc_client-messages.$(OBJEXT): ../lib/messages.C
-boinc_client-parse.$(OBJEXT): ../lib/parse.C
-boinc_client-shmem.$(OBJEXT): ../lib/shmem.C
-boinc_client-synch.$(OBJEXT): ../lib/synch.C
-boinc_client-util.$(OBJEXT): ../lib/util.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)
@@ -483,6 +438,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-parse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-pers_file_xfer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-prefs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-proxy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-scheduler_op.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-shmem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-ss_logic.Po@am__quote@
@@ -491,13 +447,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_benchmark.Po@am__quote@
 
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
 .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@
@@ -507,19 +460,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-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@
@@ -529,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-check_state.o: check_state.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-check_state.o -MD -MP -MF "$(DEPDIR)/boinc_client-check_state.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-check_state.o `test -f 'check_state.C' || echo '$(srcdir)/'`check_state.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-check_state.Tpo" "$(DEPDIR)/boinc_client-check_state.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-check_state.Tpo" "$(DEPDIR)/boinc_client-check_state.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-check_state.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='check_state.C' object='boinc_client-check_state.o' libtool=no @AMDEPBACKSLASH@
@@ -551,19 +504,19 @@ boinc_client-check_state.o: check_state.C
 
 boinc_client-check_state.obj: check_state.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-check_state.obj -MD -MP -MF "$(DEPDIR)/boinc_client-check_state.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-check_state.obj `if test -f 'check_state.C'; then $(CYGPATH_W) 'check_state.C'; else $(CYGPATH_W) '$(srcdir)/check_state.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-check_state.Tpo" "$(DEPDIR)/boinc_client-check_state.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-check_state.obj `if test -f 'check_state.C'; then $(CYGPATH_W) 'check_state.C'; else $(CYGPATH_W) '$(srcdir)/check_state.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-check_state.Tpo" "$(DEPDIR)/boinc_client-check_state.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-check_state.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='check_state.C' object='boinc_client-check_state.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-check_state.Po' tmpdepfile='$(DEPDIR)/boinc_client-check_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-check_state.obj `if test -f 'check_state.C'; then $(CYGPATH_W) 'check_state.C'; else $(CYGPATH_W) '$(srcdir)/check_state.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-check_state.obj `if test -f 'check_state.C'; then $(CYGPATH_W) 'check_state.C'; else $(CYGPATH_W) '$(srcdir)/check_state.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@
@@ -573,19 +526,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-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@
@@ -595,19 +548,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@
@@ -617,19 +570,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-cpu_benchmark.o: cpu_benchmark.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cpu_benchmark.o -MD -MP -MF "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cpu_benchmark.o `test -f 'cpu_benchmark.C' || echo '$(srcdir)/'`cpu_benchmark.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" "$(DEPDIR)/boinc_client-cpu_benchmark.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" "$(DEPDIR)/boinc_client-cpu_benchmark.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cpu_benchmark.C' object='boinc_client-cpu_benchmark.o' libtool=no @AMDEPBACKSLASH@
@@ -639,19 +592,19 @@ boinc_client-cpu_benchmark.o: cpu_benchmark.C
 
 boinc_client-cpu_benchmark.obj: cpu_benchmark.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cpu_benchmark.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cpu_benchmark.obj `if test -f 'cpu_benchmark.C'; then $(CYGPATH_W) 'cpu_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cpu_benchmark.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" "$(DEPDIR)/boinc_client-cpu_benchmark.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cpu_benchmark.obj `if test -f 'cpu_benchmark.C'; then $(CYGPATH_W) 'cpu_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cpu_benchmark.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" "$(DEPDIR)/boinc_client-cpu_benchmark.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cpu_benchmark.C' object='boinc_client-cpu_benchmark.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cpu_benchmark.Po' tmpdepfile='$(DEPDIR)/boinc_client-cpu_benchmark.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-cpu_benchmark.obj `if test -f 'cpu_benchmark.C'; then $(CYGPATH_W) 'cpu_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cpu_benchmark.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cpu_benchmark.obj `if test -f 'cpu_benchmark.C'; then $(CYGPATH_W) 'cpu_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cpu_benchmark.C'; fi`
 
 boinc_client-cs_account.o: cs_account.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_account.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_account.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_account.o `test -f 'cs_account.C' || echo '$(srcdir)/'`cs_account.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_account.Tpo" "$(DEPDIR)/boinc_client-cs_account.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_account.Tpo" "$(DEPDIR)/boinc_client-cs_account.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_account.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_account.C' object='boinc_client-cs_account.o' libtool=no @AMDEPBACKSLASH@
@@ -661,19 +614,19 @@ boinc_client-cs_account.o: cs_account.C
 
 boinc_client-cs_account.obj: cs_account.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_account.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_account.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_account.obj `if test -f 'cs_account.C'; then $(CYGPATH_W) 'cs_account.C'; else $(CYGPATH_W) '$(srcdir)/cs_account.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_account.Tpo" "$(DEPDIR)/boinc_client-cs_account.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_account.obj `if test -f 'cs_account.C'; then $(CYGPATH_W) 'cs_account.C'; else $(CYGPATH_W) '$(srcdir)/cs_account.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_account.Tpo" "$(DEPDIR)/boinc_client-cs_account.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_account.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_account.C' object='boinc_client-cs_account.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_account.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_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-cs_account.obj `if test -f 'cs_account.C'; then $(CYGPATH_W) 'cs_account.C'; else $(CYGPATH_W) '$(srcdir)/cs_account.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_account.obj `if test -f 'cs_account.C'; then $(CYGPATH_W) 'cs_account.C'; else $(CYGPATH_W) '$(srcdir)/cs_account.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@
@@ -683,19 +636,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_benchmark.o: cs_benchmark.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_benchmark.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_benchmark.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_benchmark.o `test -f 'cs_benchmark.C' || echo '$(srcdir)/'`cs_benchmark.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_benchmark.Tpo" "$(DEPDIR)/boinc_client-cs_benchmark.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_benchmark.Tpo" "$(DEPDIR)/boinc_client-cs_benchmark.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_benchmark.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_benchmark.C' object='boinc_client-cs_benchmark.o' libtool=no @AMDEPBACKSLASH@
@@ -705,19 +658,19 @@ boinc_client-cs_benchmark.o: cs_benchmark.C
 
 boinc_client-cs_benchmark.obj: cs_benchmark.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_benchmark.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_benchmark.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_benchmark.obj `if test -f 'cs_benchmark.C'; then $(CYGPATH_W) 'cs_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cs_benchmark.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_benchmark.Tpo" "$(DEPDIR)/boinc_client-cs_benchmark.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_benchmark.obj `if test -f 'cs_benchmark.C'; then $(CYGPATH_W) 'cs_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cs_benchmark.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_benchmark.Tpo" "$(DEPDIR)/boinc_client-cs_benchmark.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_benchmark.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_benchmark.C' object='boinc_client-cs_benchmark.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_benchmark.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_benchmark.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_benchmark.obj `if test -f 'cs_benchmark.C'; then $(CYGPATH_W) 'cs_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cs_benchmark.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_benchmark.obj `if test -f 'cs_benchmark.C'; then $(CYGPATH_W) 'cs_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cs_benchmark.C'; fi`
 
 boinc_client-cs_cmdline.o: cs_cmdline.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_cmdline.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_cmdline.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_cmdline.o `test -f 'cs_cmdline.C' || echo '$(srcdir)/'`cs_cmdline.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_cmdline.Tpo" "$(DEPDIR)/boinc_client-cs_cmdline.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_cmdline.Tpo" "$(DEPDIR)/boinc_client-cs_cmdline.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_cmdline.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_cmdline.C' object='boinc_client-cs_cmdline.o' libtool=no @AMDEPBACKSLASH@
@@ -727,19 +680,19 @@ boinc_client-cs_cmdline.o: cs_cmdline.C
 
 boinc_client-cs_cmdline.obj: cs_cmdline.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_cmdline.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_cmdline.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_cmdline.obj `if test -f 'cs_cmdline.C'; then $(CYGPATH_W) 'cs_cmdline.C'; else $(CYGPATH_W) '$(srcdir)/cs_cmdline.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_cmdline.Tpo" "$(DEPDIR)/boinc_client-cs_cmdline.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_cmdline.obj `if test -f 'cs_cmdline.C'; then $(CYGPATH_W) 'cs_cmdline.C'; else $(CYGPATH_W) '$(srcdir)/cs_cmdline.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_cmdline.Tpo" "$(DEPDIR)/boinc_client-cs_cmdline.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_cmdline.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_cmdline.C' object='boinc_client-cs_cmdline.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_cmdline.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_cmdline.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_cmdline.obj `if test -f 'cs_cmdline.C'; then $(CYGPATH_W) 'cs_cmdline.C'; else $(CYGPATH_W) '$(srcdir)/cs_cmdline.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_cmdline.obj `if test -f 'cs_cmdline.C'; then $(CYGPATH_W) 'cs_cmdline.C'; else $(CYGPATH_W) '$(srcdir)/cs_cmdline.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@
@@ -749,19 +702,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_prefs.o: cs_prefs.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_prefs.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_prefs.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_prefs.o `test -f 'cs_prefs.C' || echo '$(srcdir)/'`cs_prefs.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_prefs.Tpo" "$(DEPDIR)/boinc_client-cs_prefs.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_prefs.Tpo" "$(DEPDIR)/boinc_client-cs_prefs.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_prefs.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_prefs.C' object='boinc_client-cs_prefs.o' libtool=no @AMDEPBACKSLASH@
@@ -771,19 +724,19 @@ boinc_client-cs_prefs.o: cs_prefs.C
 
 boinc_client-cs_prefs.obj: cs_prefs.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_prefs.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_prefs.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_prefs.obj `if test -f 'cs_prefs.C'; then $(CYGPATH_W) 'cs_prefs.C'; else $(CYGPATH_W) '$(srcdir)/cs_prefs.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_prefs.Tpo" "$(DEPDIR)/boinc_client-cs_prefs.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_prefs.obj `if test -f 'cs_prefs.C'; then $(CYGPATH_W) 'cs_prefs.C'; else $(CYGPATH_W) '$(srcdir)/cs_prefs.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_prefs.Tpo" "$(DEPDIR)/boinc_client-cs_prefs.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_prefs.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_prefs.C' object='boinc_client-cs_prefs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_prefs.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_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-cs_prefs.obj `if test -f 'cs_prefs.C'; then $(CYGPATH_W) 'cs_prefs.C'; else $(CYGPATH_W) '$(srcdir)/cs_prefs.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_prefs.obj `if test -f 'cs_prefs.C'; then $(CYGPATH_W) 'cs_prefs.C'; else $(CYGPATH_W) '$(srcdir)/cs_prefs.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@
@@ -793,19 +746,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-cs_statefile.o: cs_statefile.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_statefile.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_statefile.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_statefile.o `test -f 'cs_statefile.C' || echo '$(srcdir)/'`cs_statefile.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_statefile.Tpo" "$(DEPDIR)/boinc_client-cs_statefile.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_statefile.Tpo" "$(DEPDIR)/boinc_client-cs_statefile.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_statefile.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_statefile.C' object='boinc_client-cs_statefile.o' libtool=no @AMDEPBACKSLASH@
@@ -815,19 +768,19 @@ boinc_client-cs_statefile.o: cs_statefile.C
 
 boinc_client-cs_statefile.obj: cs_statefile.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_statefile.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cs_statefile.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_statefile.obj `if test -f 'cs_statefile.C'; then $(CYGPATH_W) 'cs_statefile.C'; else $(CYGPATH_W) '$(srcdir)/cs_statefile.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-cs_statefile.Tpo" "$(DEPDIR)/boinc_client-cs_statefile.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-cs_statefile.obj `if test -f 'cs_statefile.C'; then $(CYGPATH_W) 'cs_statefile.C'; else $(CYGPATH_W) '$(srcdir)/cs_statefile.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-cs_statefile.Tpo" "$(DEPDIR)/boinc_client-cs_statefile.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-cs_statefile.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cs_statefile.C' object='boinc_client-cs_statefile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-cs_statefile.Po' tmpdepfile='$(DEPDIR)/boinc_client-cs_statefile.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_statefile.obj `if test -f 'cs_statefile.C'; then $(CYGPATH_W) 'cs_statefile.C'; else $(CYGPATH_W) '$(srcdir)/cs_statefile.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cs_statefile.obj `if test -f 'cs_statefile.C'; then $(CYGPATH_W) 'cs_statefile.C'; else $(CYGPATH_W) '$(srcdir)/cs_statefile.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@
@@ -837,19 +790,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@
@@ -859,19 +812,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-gui_rpc_server.o: gui_rpc_server.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-gui_rpc_server.o -MD -MP -MF "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-gui_rpc_server.o `test -f 'gui_rpc_server.C' || echo '$(srcdir)/'`gui_rpc_server.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo" "$(DEPDIR)/boinc_client-gui_rpc_server.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo" "$(DEPDIR)/boinc_client-gui_rpc_server.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui_rpc_server.C' object='boinc_client-gui_rpc_server.o' libtool=no @AMDEPBACKSLASH@
@@ -881,19 +834,19 @@ boinc_client-gui_rpc_server.o: gui_rpc_server.C
 
 boinc_client-gui_rpc_server.obj: gui_rpc_server.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-gui_rpc_server.obj -MD -MP -MF "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-gui_rpc_server.obj `if test -f 'gui_rpc_server.C'; then $(CYGPATH_W) 'gui_rpc_server.C'; else $(CYGPATH_W) '$(srcdir)/gui_rpc_server.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo" "$(DEPDIR)/boinc_client-gui_rpc_server.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-gui_rpc_server.obj `if test -f 'gui_rpc_server.C'; then $(CYGPATH_W) 'gui_rpc_server.C'; else $(CYGPATH_W) '$(srcdir)/gui_rpc_server.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo" "$(DEPDIR)/boinc_client-gui_rpc_server.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-gui_rpc_server.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui_rpc_server.C' object='boinc_client-gui_rpc_server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-gui_rpc_server.Po' tmpdepfile='$(DEPDIR)/boinc_client-gui_rpc_server.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-gui_rpc_server.obj `if test -f 'gui_rpc_server.C'; then $(CYGPATH_W) 'gui_rpc_server.C'; else $(CYGPATH_W) '$(srcdir)/gui_rpc_server.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-gui_rpc_server.obj `if test -f 'gui_rpc_server.C'; then $(CYGPATH_W) 'gui_rpc_server.C'; else $(CYGPATH_W) '$(srcdir)/gui_rpc_server.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@
@@ -903,19 +856,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@
@@ -925,19 +878,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@
@@ -947,19 +900,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@
@@ -969,19 +922,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-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@
@@ -991,19 +944,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-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@
@@ -1013,19 +966,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@
@@ -1035,19 +988,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@
@@ -1057,19 +1010,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@
@@ -1079,19 +1032,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@
@@ -1101,19 +1054,41 @@ 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-proxy.o: proxy.C
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-proxy.o -MD -MP -MF "$(DEPDIR)/boinc_client-proxy.Tpo" \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-proxy.o `test -f 'proxy.C' || echo '$(srcdir)/'`proxy.C; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-proxy.Tpo" "$(DEPDIR)/boinc_client-proxy.Po"; \
+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-proxy.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='proxy.C' object='boinc_client-proxy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-proxy.Po' tmpdepfile='$(DEPDIR)/boinc_client-proxy.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-proxy.o `test -f 'proxy.C' || echo '$(srcdir)/'`proxy.C
+
+boinc_client-proxy.obj: proxy.C
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-proxy.obj -MD -MP -MF "$(DEPDIR)/boinc_client-proxy.Tpo" \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-proxy.obj `if test -f 'proxy.C'; then $(CYGPATH_W) 'proxy.C'; else $(CYGPATH_W) '$(srcdir)/proxy.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-proxy.Tpo" "$(DEPDIR)/boinc_client-proxy.Po"; \
+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-proxy.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='proxy.C' object='boinc_client-proxy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-proxy.Po' tmpdepfile='$(DEPDIR)/boinc_client-proxy.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-proxy.obj `if test -f 'proxy.C'; then $(CYGPATH_W) 'proxy.C'; else $(CYGPATH_W) '$(srcdir)/proxy.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@
@@ -1123,19 +1098,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-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@
@@ -1145,19 +1120,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@
@@ -1167,19 +1142,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-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@
@@ -1189,19 +1164,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-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@
@@ -1211,19 +1186,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-diagnostics.o: ../lib/diagnostics.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-diagnostics.o -MD -MP -MF "$(DEPDIR)/boinc_client-diagnostics.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-diagnostics.o `test -f '../lib/diagnostics.C' || echo '$(srcdir)/'`../lib/diagnostics.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-diagnostics.Tpo" "$(DEPDIR)/boinc_client-diagnostics.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-diagnostics.Tpo" "$(DEPDIR)/boinc_client-diagnostics.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-diagnostics.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/diagnostics.C' object='boinc_client-diagnostics.o' libtool=no @AMDEPBACKSLASH@
@@ -1233,19 +1208,19 @@ boinc_client-diagnostics.o: ../lib/diagnostics.C
 
 boinc_client-diagnostics.obj: ../lib/diagnostics.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-diagnostics.obj -MD -MP -MF "$(DEPDIR)/boinc_client-diagnostics.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-diagnostics.obj `if test -f '../lib/diagnostics.C'; then $(CYGPATH_W) '../lib/diagnostics.C'; else $(CYGPATH_W) '$(srcdir)/../lib/diagnostics.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-diagnostics.Tpo" "$(DEPDIR)/boinc_client-diagnostics.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-diagnostics.obj `if test -f '../lib/diagnostics.C'; then $(CYGPATH_W) '../lib/diagnostics.C'; else $(CYGPATH_W) '$(srcdir)/../lib/diagnostics.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-diagnostics.Tpo" "$(DEPDIR)/boinc_client-diagnostics.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-diagnostics.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/diagnostics.C' object='boinc_client-diagnostics.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-diagnostics.Po' tmpdepfile='$(DEPDIR)/boinc_client-diagnostics.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-diagnostics.obj `if test -f '../lib/diagnostics.C'; then $(CYGPATH_W) '../lib/diagnostics.C'; else $(CYGPATH_W) '$(srcdir)/../lib/diagnostics.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-diagnostics.obj `if test -f '../lib/diagnostics.C'; then $(CYGPATH_W) '../lib/diagnostics.C'; else $(CYGPATH_W) '$(srcdir)/../lib/diagnostics.C'; fi`
 
 boinc_client-exception.o: ../lib/exception.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-exception.o -MD -MP -MF "$(DEPDIR)/boinc_client-exception.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-exception.o `test -f '../lib/exception.C' || echo '$(srcdir)/'`../lib/exception.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-exception.Tpo" "$(DEPDIR)/boinc_client-exception.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-exception.Tpo" "$(DEPDIR)/boinc_client-exception.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-exception.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/exception.C' object='boinc_client-exception.o' libtool=no @AMDEPBACKSLASH@
@@ -1255,19 +1230,19 @@ boinc_client-exception.o: ../lib/exception.C
 
 boinc_client-exception.obj: ../lib/exception.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-exception.obj -MD -MP -MF "$(DEPDIR)/boinc_client-exception.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-exception.obj `if test -f '../lib/exception.C'; then $(CYGPATH_W) '../lib/exception.C'; else $(CYGPATH_W) '$(srcdir)/../lib/exception.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-exception.Tpo" "$(DEPDIR)/boinc_client-exception.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-exception.obj `if test -f '../lib/exception.C'; then $(CYGPATH_W) '../lib/exception.C'; else $(CYGPATH_W) '$(srcdir)/../lib/exception.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-exception.Tpo" "$(DEPDIR)/boinc_client-exception.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-exception.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/exception.C' object='boinc_client-exception.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-exception.Po' tmpdepfile='$(DEPDIR)/boinc_client-exception.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-exception.obj `if test -f '../lib/exception.C'; then $(CYGPATH_W) '../lib/exception.C'; else $(CYGPATH_W) '$(srcdir)/../lib/exception.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-exception.obj `if test -f '../lib/exception.C'; then $(CYGPATH_W) '../lib/exception.C'; else $(CYGPATH_W) '$(srcdir)/../lib/exception.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@
@@ -1277,19 +1252,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@
@@ -1299,19 +1274,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-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@
@@ -1321,19 +1296,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-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@
@@ -1343,19 +1318,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`
 
 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@
@@ -1365,19 +1340,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@
@@ -1387,19 +1362,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-synch.o: ../lib/synch.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-synch.o -MD -MP -MF "$(DEPDIR)/boinc_client-synch.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o boinc_client-synch.o `test -f '../lib/synch.C' || echo '$(srcdir)/'`../lib/synch.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-synch.Tpo" "$(DEPDIR)/boinc_client-synch.Po"; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-synch.Tpo" "$(DEPDIR)/boinc_client-synch.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-synch.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/synch.C' object='boinc_client-synch.o' libtool=no @AMDEPBACKSLASH@
@@ -1409,19 +1384,19 @@ boinc_client-synch.o: ../lib/synch.C
 
 boinc_client-synch.obj: ../lib/synch.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-synch.obj -MD -MP -MF "$(DEPDIR)/boinc_client-synch.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o boinc_client-synch.obj `if test -f '../lib/synch.C'; then $(CYGPATH_W) '../lib/synch.C'; else $(CYGPATH_W) '$(srcdir)/../lib/synch.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/boinc_client-synch.Tpo" "$(DEPDIR)/boinc_client-synch.Po"; \
+@am__fastdepCXX_TRUE@	  -c -o boinc_client-synch.obj `if test -f '../lib/synch.C'; then $(CYGPATH_W) '../lib/synch.C'; else $(CYGPATH_W) '$(srcdir)/../lib/synch.C'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/boinc_client-synch.Tpo" "$(DEPDIR)/boinc_client-synch.Po"; \
 @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/boinc_client-synch.Tpo"; exit 1; \
 @am__fastdepCXX_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/synch.C' object='boinc_client-synch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/boinc_client-synch.Po' tmpdepfile='$(DEPDIR)/boinc_client-synch.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-synch.obj `if test -f '../lib/synch.C'; then $(CYGPATH_W) '../lib/synch.C'; else $(CYGPATH_W) '$(srcdir)/../lib/synch.C'`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-synch.obj `if test -f '../lib/synch.C'; then $(CYGPATH_W) '../lib/synch.C'; else $(CYGPATH_W) '$(srcdir)/../lib/synch.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@
@@ -1431,19 +1406,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`
 
 .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@
@@ -1453,19 +1428,19 @@ boinc_client-util.obj: ../lib/util.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@
@@ -1475,14 +1450,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
@@ -1544,11 +1519,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,/[^/]*$$,,'`; \
@@ -1575,7 +1552,6 @@ all-am: Makefile $(PROGRAMS) all-local
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -1587,7 +1563,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -1595,7 +1571,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1605,9 +1581,10 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-tags
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1628,7 +1605,8 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
@@ -1647,15 +1625,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-binPROGRAMS clean-generic clean-local ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-info-am
 
 
 $(LIBRSA):
diff --git a/client/client_messages.C b/client/client_messages.C
index c7bf6c228b..551000ad37 100644
--- a/client/client_messages.C
+++ b/client/client_messages.C
@@ -34,6 +34,7 @@ const char* ClientMessages::v_format_kind(int kind) const
     case DEBUG_FILE_XFER:   return "DEBUG_FILE_XFER  ";
     case DEBUG_SCHED_OP:    return "DEBUG_SCHED_OP   ";
     case DEBUG_HTTP:        return "DEBUG_HTTP       ";
+    case DEBUG_PROXY:       return "DEBUG_PROXY      ";
     case DEBUG_TIME:        return "DEBUG_TIME       ";
     case DEBUG_NET_XFER:    return "DEBUG_NET_XFER   ";
     case DEBUG_MEASUREMENT: return "DEBUG_MEASUREMENT";
@@ -50,6 +51,7 @@ bool ClientMessages::v_message_wanted(int kind) const
     case DEBUG_FILE_XFER:   return log_flags.file_xfer_debug;
     case DEBUG_SCHED_OP:    return log_flags.sched_op_debug;
     case DEBUG_HTTP:        return log_flags.http_debug;
+    case DEBUG_PROXY:       return log_flags.proxy_debug;
     case DEBUG_TIME:        return log_flags.time_debug;
     case DEBUG_NET_XFER:    return log_flags.net_xfer_debug;
     case DEBUG_MEASUREMENT: return log_flags.measurement_debug;
diff --git a/client/client_state.C b/client/client_state.C
index 29a5a77e5e..b25076bc03 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -81,14 +81,9 @@ CLIENT_STATE::CLIENT_STATE() {
     app_started = 0;
     exit_before_upload = false;
     user_idle = true;
-    use_http_proxy = false;
-    use_socks_proxy = false;
+    pi.clear();
     show_projects = false;
     strcpy(detach_project_url, "");
-    strcpy(proxy_server_name, "");
-    proxy_server_port = 80;
-    strcpy(socks_user_name, "");
-    strcpy(socks_user_passwd, "");
     strcpy(host_venue, "");
     user_run_request = USER_RUN_REQUEST_AUTO;
     started_by_screensaver = false;
diff --git a/client/client_state.h b/client/client_state.h
index 289033eda3..cc920f4d08 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -79,6 +79,7 @@ public:
     GUI_RPC_CONN_SET gui_rpcs;
     LANGUAGE language;
     TIME_STATS time_stats;
+    PROXY_INFO pi;
 
     int core_client_major_version;
     int core_client_minor_version;
@@ -90,18 +91,12 @@ public:
     bool return_results_immediately;
     bool show_projects;
     bool requested_exit;
-    bool use_http_proxy;
-    bool use_socks_proxy;
-    int proxy_server_port;
     char detach_project_url[256];
         // stores URL for -detach_project option
     char reset_project_url[256];
         // stores URL for -reset_project option
     char update_prefs_url[256];
         // stores URL for -update_prefs option
-    char proxy_server_name[256];
-    char socks_user_name[256];
-    char socks_user_passwd[256];
     char host_venue[256];    // venue, as reported by project that sent us
         // most recent global prefs
     bool exit_before_upload;
diff --git a/client/cs_cmdline.C b/client/cs_cmdline.C
index 0a765d7e52..3bc70e1a4f 100644
--- a/client/cs_cmdline.C
+++ b/client/cs_cmdline.C
@@ -163,24 +163,37 @@ void CLIENT_STATE::parse_env_vars() {
 
     if ((p = getenv("HTTP_PROXY"))) {
         if (strlen(p) > 0) {
-            use_http_proxy = true;
-            parse_url(p, proxy_server_name, proxy_server_port, temp);
+            pi.use_http_proxy = true;
+            parse_url(p, pi.http_server_name, pi.http_server_port, temp);
         }
     }
 
-    if ((p = getenv("SOCKS_SERVER"))) {
+    pi.socks_version = 
+        getenv("SOCKS5_SERVER")?SOCKS_VERSION_5:
+        getenv("SOCKS4_SERVER")?SOCKS_VERSION_4:
+        getenv("SOCKS_SERVER")?SOCKS_VERSION_5:
+        SOCKS_VERSION_5;
+
+    if ((p = getenv("SOCKS4_SERVER"))) {
         if (strlen(p) > 0) {
-            use_socks_proxy = true;
-            parse_url(p, proxy_server_name, proxy_server_port, temp);
+            pi.use_socks_proxy = true;
+            parse_url(p, pi.socks_server_name, pi.socks_server_port, temp);
         }
     }
 
-    if ((p = getenv("SOCKS_USER"))) {
-        safe_strcpy(socks_user_name, p);
+    if ((p = getenv("SOCKS_SERVER")) || (p = getenv("SOCKS5_SERVER"))) {
+        if (strlen(p) > 0) {
+            pi.use_socks_proxy = true;
+            parse_url(p, pi.socks_server_name, pi.socks_server_port, temp);
+        }
     }
 
-    if ((p = getenv("SOCKS_PASSWD"))) {
-        safe_strcpy(socks_user_passwd, p);
+    if ((p = getenv("SOCKS5_USER")) || (p = getenv("SOCKS_USER"))) {
+        safe_strcpy(pi.socks5_user_name, p);
+    }
+
+    if ((p = getenv("SOCKS5_PASSWD"))) {
+        safe_strcpy(pi.socks5_user_passwd, p);
     }
 }
 
diff --git a/client/cs_statefile.C b/client/cs_statefile.C
index 0b3d05f59e..6ea9e84212 100644
--- a/client/cs_statefile.C
+++ b/client/cs_statefile.C
@@ -148,14 +148,9 @@ int CLIENT_STATE::parse_state_file() {
             // after core client update
         } else if (parse_int(buf, "<core_client_major_version>", old_major_version)) {
         } else if (parse_int(buf, "<core_client_minor_version>", old_minor_version)) {
-        } else if (match_tag(buf, "<use_http_proxy/>")) {
-            use_http_proxy = true;
-        } else if (match_tag(buf, "<use_socks_proxy/>")) {
-            use_socks_proxy = true;
-        } else if (parse_str(buf, "<proxy_server_name>", proxy_server_name, sizeof(proxy_server_name))) {
-        } else if (parse_int(buf, "<proxy_server_port>", proxy_server_port)) {
-        } else if (parse_str(buf, "<socks_user_name>", socks_user_name, sizeof(socks_user_name))) {
-        } else if (parse_str(buf, "<socks_user_passwd>", socks_user_passwd, sizeof(socks_user_passwd))) {
+        } else if (match_tag(buf, "<proxy_info>")) {
+            retval = pi.parse(f);
+            if (retval) goto done;
         // } else if (parse_int(buf, "<user_run_request/>")) {
         } else if (parse_str(buf, "<host_venue>", host_venue, sizeof(host_venue))) {
         } else {
@@ -261,20 +256,7 @@ int CLIENT_STATE::write_state(FILE* f) {
 
     // save proxy info
     //
-    fprintf(f,
-        "%s"
-        "%s"
-        "<proxy_server_name>%s</proxy_server_name>\n"
-        "<proxy_server_port>%d</proxy_server_port>\n"
-        "<socks_user_name>%s</socks_user_name>\n"
-        "<socks_user_passwd>%s</socks_user_passwd>\n",
-        use_http_proxy?"<use_http_proxy/>\n":"",
-        use_socks_proxy?"<use_socks_proxy/>\n":"",
-        proxy_server_name,
-        proxy_server_port,
-        socks_user_name,
-        socks_user_passwd
-    );
+    pi.write(f);
 #if 0
     fprintf(f, "<user_run_request>%d</user_run_request>\n", user_run_request);
 #endif
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index 03023d05ae..635151fda2 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -150,18 +150,28 @@ static void handle_run_benchmarks(char* buf, FILE* fout) {
 }
 
 static void handle_set_proxy_settings(char* buf, FILE* fout) {
-    string proxy_server_name;
-    int proxy_server_port;
-    if (!parse_str(buf, "<proxy_server_name>", proxy_server_name)) {
-        fprintf(fout, "<error>Proxy server name missing</error>\n");
+    string socks_proxy_server_name,http_proxy_server_name;
+    int socks_proxy_server_port,http_proxy_server_port;
+    if (!parse_str(buf, "<socks_proxy_server_name>", socks_proxy_server_name)) {
+        fprintf(fout, "<error>SOCKS proxy server name missing</error>\n");
         return;
     }
-    if (!parse_int(buf, "<proxy_server_port>", proxy_server_port)) {
-        fprintf(fout, "<error>Proxy server port missing</error>\n");
+    if (!parse_int(buf, "<socks_proxy_server_port>", socks_proxy_server_port)) {
+        fprintf(fout, "<error>SOCKS proxy server port missing</error>\n");
         return;
     }
-    safe_strcpy(gstate.proxy_server_name, proxy_server_name.c_str());
-    gstate.proxy_server_port = proxy_server_port;
+    if (!parse_str(buf, "<http_proxy_server_name>", http_proxy_server_name)) {
+        fprintf(fout, "<error>HTTP proxy server name missing</error>\n");
+        return;
+    }
+    if (!parse_int(buf, "<http_proxy_server_port>", http_proxy_server_port)) {
+        fprintf(fout, "<error>HTTP proxy server port missing</error>\n");
+        return;
+    }
+    safe_strcpy(gstate.pi.socks_server_name, socks_proxy_server_name.c_str());
+    gstate.pi.socks_server_port = socks_proxy_server_port;
+    safe_strcpy(gstate.pi.http_server_name, http_proxy_server_name.c_str());
+    gstate.pi.http_server_port = http_proxy_server_port;
     fprintf(fout, "<success/>\n");
 }
 
diff --git a/client/http.C b/client/http.C
index 418c3740dc..89996f939e 100644
--- a/client/http.C
+++ b/client/http.C
@@ -247,9 +247,6 @@ HTTP_OP::HTTP_OP() {
     http_op_state = HTTP_STATE_IDLE;
     http_op_type = HTTP_OP_NONE;
     http_op_retval = 0;
-    use_http_proxy = false;
-    proxy_server_port = 0;
-    strcpy(proxy_server_name, "");
 }
 
 HTTP_OP::~HTTP_OP() {
@@ -260,10 +257,11 @@ HTTP_OP::~HTTP_OP() {
 int HTTP_OP::init_head(const char* url) {
     char proxy_buf[256];
     parse_url(url, url_hostname, port, filename);
-    NET_XFER::init(use_http_proxy?proxy_server_name:url_hostname, use_http_proxy?proxy_server_port:port, HTTP_BLOCKSIZE);
+    PROXY::init(url_hostname, port);
+    NET_XFER::init(get_proxy_server_name(url_hostname),get_proxy_port(port), HTTP_BLOCKSIZE);
     http_op_type = HTTP_OP_HEAD;
     http_op_state = HTTP_STATE_CONNECTING;
-    if (use_http_proxy) {
+    if (pi.use_http_proxy) {
         sprintf(proxy_buf, "http://%s:%d/%s", url_hostname, port, filename);
     } else {
         sprintf(proxy_buf, "/%s", filename);
@@ -282,14 +280,15 @@ int HTTP_OP::init_get(const char* url, char* out, bool del_old_file, double off)
     }
     file_offset = off;
     parse_url(url, url_hostname, port, filename);
-    NET_XFER::init(use_http_proxy?proxy_server_name:url_hostname, use_http_proxy?proxy_server_port:port, HTTP_BLOCKSIZE);
+    PROXY::init(url_hostname, port);
+    NET_XFER::init(get_proxy_server_name(url_hostname),get_proxy_port(port), HTTP_BLOCKSIZE);
     safe_strcpy(outfile, out);
 	if (off != 0){
 		bytes_xferred = off;
 	}
     http_op_type = HTTP_OP_GET;
     http_op_state = HTTP_STATE_CONNECTING;
-    if (use_http_proxy) {
+    if (pi.use_http_proxy) {
         sprintf(proxy_buf, "http://%s:%d/%s", url_hostname, port, filename);
     } else {
         sprintf(proxy_buf, "/%s", filename);
@@ -308,7 +307,8 @@ int HTTP_OP::init_post(const char* url, char* in, char* out) {
     ScopeMessages scope_messages(log_messages, ClientMessages::DEBUG_HTTP);
 
     parse_url(url, url_hostname, port, filename);
-    NET_XFER::init(use_http_proxy?proxy_server_name:url_hostname, use_http_proxy?proxy_server_port:port, HTTP_BLOCKSIZE);
+    PROXY::init(url_hostname, port);
+    NET_XFER::init(get_proxy_server_name(url_hostname),get_proxy_port(port), HTTP_BLOCKSIZE);
     safe_strcpy(infile, in);
     safe_strcpy(outfile, out);
     retval = file_size(infile, size);
@@ -316,7 +316,7 @@ int HTTP_OP::init_post(const char* url, char* in, char* out) {
     content_length = (int)size;
     http_op_type = HTTP_OP_POST;
     http_op_state = HTTP_STATE_CONNECTING;
-    if (use_http_proxy) {
+    if (pi.use_http_proxy) {
         sprintf(proxy_buf, "http://%s:%d/%s", url_hostname, port, filename);
     } else {
         sprintf(proxy_buf, "/%s", filename);
@@ -338,7 +338,8 @@ int HTTP_OP::init_post2(
     char proxy_buf[256];
 
     parse_url(url, url_hostname, port, filename);
-    NET_XFER::init(use_http_proxy?proxy_server_name:url_hostname, use_http_proxy?proxy_server_port:port, HTTP_BLOCKSIZE);
+    PROXY::init(url_hostname, port);
+    NET_XFER::init(get_proxy_server_name(url_hostname),get_proxy_port(port), HTTP_BLOCKSIZE);
     req1 = r1;
     if (in) {
         safe_strcpy(infile, in);
@@ -353,7 +354,7 @@ int HTTP_OP::init_post2(
     content_length += strlen(req1);
     http_op_type = HTTP_OP_POST2;
     http_op_state = HTTP_STATE_CONNECTING;
-    if (use_http_proxy) {
+    if (pi.use_http_proxy) {
         sprintf(proxy_buf, "http://%s:%d/%s", url_hostname, port, filename);
     } else {
         sprintf(proxy_buf, "/%s", filename);
@@ -403,11 +404,50 @@ bool HTTP_OP_SET::poll() {
                 break;
             }
             if (htp->is_connected) {
-                htp->http_op_state = HTTP_STATE_REQUEST_HEADER;
+                htp->http_op_state = HTTP_STATE_SOCKS_CONNECT;
                 htp->want_upload = true;
                 action = true;
             }
             break;
+        case HTTP_STATE_SOCKS_CONNECT:
+            // Since the HTTP layer is synchronous with the proxy layer, we
+            // call proxy_poll() here instead of in do_something()
+            htp->proxy_poll();
+
+            // After negotiation with the proxy is complete, advance to
+            // the next step of the HTTP layer
+            if (htp->proxy_negotiated()) {
+                if (htp->proxy_retval) {
+                    htp->http_op_state = HTTP_STATE_DONE;
+                    htp->http_op_retval = htp->proxy_retval;
+                    switch (htp->proxy_retval) {
+                        case ERR_SOCKS_UNKNOWN_FAILURE:
+                            msg_printf(NULL, MSG_ERROR, "An unknown SOCKS server error occurred\n");
+                            break;
+                        case ERR_SOCKS_REQUEST_FAILED:
+                            msg_printf(NULL, MSG_ERROR, "The SOCKS server denied access for this computer\n");
+                            break;
+                        case ERR_SOCKS_BAD_USER_PASS:
+                            msg_printf(NULL, MSG_ERROR, "Incorrect SOCKS user name and/or password\n");
+                            break;
+                        case ERR_SOCKS_UNKNOWN_SERVER_VERSION:
+                            msg_printf(NULL, MSG_ERROR, "The SOCKS server is using an unknown version\n");
+                            break;
+                        case ERR_SOCKS_UNSUPPORTED:
+                            msg_printf(NULL, MSG_ERROR, "The SOCKS server is using unsupported features unknown to BOINC\n");
+                            break;
+                        case ERR_SOCKS_CANT_REACH_HOST:
+                            msg_printf(NULL, MSG_ERROR, "The SOCKS server is unable to contact the host\n");
+                            break;
+                        case ERR_SOCKS_CONN_REFUSED:
+                            msg_printf(NULL, MSG_ERROR, "The connection from the SOCKS server to the host was refused\n");
+                            break;
+                    }
+                } else {
+                    htp->http_op_state = HTTP_STATE_REQUEST_HEADER;
+                }
+            }
+            break;
         case HTTP_STATE_REQUEST_HEADER:
             if (htp->io_ready) {
                 action = true;
diff --git a/client/http.h b/client/http.h
index 4a52b8ed7b..9a595fe59c 100644
--- a/client/http.h
+++ b/client/http.h
@@ -24,7 +24,7 @@
 #ifndef _HTTP_
 #define _HTTP_
 
-#include "net_xfer.h"
+#include "proxy.h"
 
 // official HTTP status codes
 #define HTTP_STATUS_OK              200
@@ -54,7 +54,7 @@ struct HTTP_REPLY_HEADER {
     // of a string and a file w/offset,
     // and the reply goes into a memory buffer
 
-class HTTP_OP : public NET_XFER {
+class HTTP_OP : public PROXY {
 public:
     HTTP_OP();
     ~HTTP_OP();
@@ -75,9 +75,6 @@ public:
     int http_op_type;
     int http_op_retval;
         // zero if success, or a BOINC error code, or an HTTP status code
-    bool use_http_proxy;
-    int proxy_server_port;
-    char proxy_server_name[256];
 
     int init_head(const char* url);
     int init_get(const char* url, char* outfile, bool del_old_file, double offset=0);
@@ -102,13 +99,14 @@ public:
 
 #define HTTP_STATE_IDLE             0
 #define HTTP_STATE_CONNECTING       1
-#define HTTP_STATE_REQUEST_HEADER   2
-#define HTTP_STATE_REQUEST_BODY1    3
+#define HTTP_STATE_SOCKS_CONNECT    2
+#define HTTP_STATE_REQUEST_HEADER   3
+#define HTTP_STATE_REQUEST_BODY1    4
     // sending the string part of a POST2 operation
-#define HTTP_STATE_REQUEST_BODY     4
-#define HTTP_STATE_REPLY_HEADER     5
-#define HTTP_STATE_REPLY_BODY       6
-#define HTTP_STATE_DONE             7
+#define HTTP_STATE_REQUEST_BODY     5
+#define HTTP_STATE_REPLY_HEADER     6
+#define HTTP_STATE_REPLY_BODY       7
+#define HTTP_STATE_DONE             8
 
 extern void parse_url(const char* url, char* host, int &port, char* file);
 
diff --git a/client/log_flags.C b/client/log_flags.C
index 0d21c6cd9b..514ac2acb6 100644
--- a/client/log_flags.C
+++ b/client/log_flags.C
@@ -53,6 +53,7 @@ LOG_FLAGS::LOG_FLAGS() {
     file_xfer_debug = false;
     sched_op_debug = false;
     http_debug = false;
+    proxy_debug = false;
     time_debug = false;
     net_xfer_debug = false;
     measurement_debug = false;
@@ -92,6 +93,9 @@ int LOG_FLAGS::parse(FILE* in) {
         } else if (match_tag(buf, "<http_debug/>")) {
             http_debug = true;
             continue;
+        } else if (match_tag(buf, "<proxy_debug/>")) {
+            proxy_debug = true;
+            continue;
         } else if (match_tag(buf, "<time_debug/>")) {
             time_debug = true;
             continue;
diff --git a/client/log_flags.h b/client/log_flags.h
index 6bf037b0fb..45692e3554 100644
--- a/client/log_flags.h
+++ b/client/log_flags.h
@@ -45,6 +45,7 @@ public:
     bool file_xfer_debug;
     bool sched_op_debug;
     bool http_debug;
+    bool proxy_debug;
     bool time_debug;        // print message on sleep
     bool net_xfer_debug;
     bool measurement_debug; // host measurement notices
diff --git a/client/message.h b/client/message.h
index cc38d98b59..3db642fa7c 100644
--- a/client/message.h
+++ b/client/message.h
@@ -46,6 +46,7 @@ public:
         DEBUG_FILE_XFER,
         DEBUG_SCHED_OP,
         DEBUG_HTTP,
+        DEBUG_PROXY,
         DEBUG_TIME,        // print message on sleep
         DEBUG_NET_XFER,
         DEBUG_MEASUREMENT, // host measurement notices
diff --git a/client/net_xfer.C b/client/net_xfer.C
index 823c6bb317..093fcb58f1 100644
--- a/client/net_xfer.C
+++ b/client/net_xfer.C
@@ -99,6 +99,10 @@ int get_socket_error(int fd) {
     return n;
 }
 
+int NET_XFER::get_ip_addr(int &ip_addr) {
+    return get_ip_addr(hostname,ip_addr);
+}
+
 int NET_XFER::get_ip_addr(char *hostname, int &ip_addr) {
     hostent* hep;
 
diff --git a/client/net_xfer.h b/client/net_xfer.h
index 435662cf8d..cfe583a4e2 100644
--- a/client/net_xfer.h
+++ b/client/net_xfer.h
@@ -64,6 +64,7 @@ public:
     int file_read_buf_offset, file_read_buf_len;
 
     void init(char* host, int port, int blocksize);
+    int get_ip_addr(int &ip_addr);
     int get_ip_addr(char *hostname, int &ip_addr);
     int open_server();
     void close_socket();
diff --git a/client/pers_file_xfer.C b/client/pers_file_xfer.C
index e2f1fb7418..4fbc292607 100644
--- a/client/pers_file_xfer.C
+++ b/client/pers_file_xfer.C
@@ -117,11 +117,7 @@ int PERS_FILE_XFER::start_xfer() {
     // download or upload for the persistent file transfer
     //
     file_xfer = new FILE_XFER;
-    if (gstate.use_http_proxy) {
-        file_xfer->use_http_proxy = true;
-        safe_strcpy(file_xfer->proxy_server_name, gstate.proxy_server_name);
-        file_xfer->proxy_server_port = gstate.proxy_server_port;
-    }
+    file_xfer->set_proxy(&gstate.pi);
     if (is_upload) {
         if (gstate.exit_before_upload) {
             exit(0);
diff --git a/client/proxy.C b/client/proxy.C
new file mode 100644
index 0000000000..f8e9751d99
--- /dev/null
+++ b/client/proxy.C
@@ -0,0 +1,483 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved.
+//
+// Contributor(s):
+//
+
+#include "cpp.h"
+#include <cstring>
+#include <sstream>
+
+#ifdef _WIN32
+#include "winsock.h"
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "error_numbers.h"
+#include "filesys.h"
+#include "util.h"
+#include "message.h"
+#include "parse.h"
+
+#include "proxy.h"
+
+// Read the contents of the socket into buf
+//
+static int proxy_read_reply(int socket, char* buf, int len) {
+    int i, n;
+    for (i=0; i<len-1; i++) {
+        n = recv(socket, buf+i, 1, 0);
+        if (n != 1) break;
+    }
+    buf[i] = 0;
+    return i;
+}
+
+// Make sure we send the full contents of each message.  Messages
+// are relatively short, so it's safe
+// 
+/*static int proxy_atomic_send(int socket, char *buf, int size) {
+    int ret, len;
+    
+    ret = 0;
+    while (size > 0) {
+        len = send(socket, buf+ret, size, 0);
+        if ( len == -1 && errno != ) fatal("atomic_out() failed to send(), %d\n", socks_errno());
+        ret += len;
+        size -= len;
+    }
+    return ret;
+}
+*/
+
+void print_buf( char *buf, int n ) {
+    for (int i=0;i<n;i++) printf( "%d ",buf[i] );
+    printf( "\n" );
+}
+
+int PROXY_INFO::parse(FILE* in) {
+    char buf[256];
+
+    memset(this, 0, sizeof(PROXY_INFO));
+    while (fgets(buf, 256, in)) {
+        if (match_tag(buf, "</proxy_info>")) return 0;
+        else if (match_tag(buf, "<use_http_proxy/>")) use_http_proxy = true;
+        else if (match_tag(buf, "<use_socks_proxy/>")) use_socks_proxy = true;
+        else if (parse_int(buf, "<socks_version>", socks_version)) continue;
+        else if (parse_str(buf, "<socks_server_name>", socks_server_name, sizeof(socks_server_name))) continue;
+        else if (parse_int(buf, "<socks_server_port>", socks_server_port)) continue;
+        else if (parse_str(buf, "<http_server_name>", http_server_name, sizeof(http_server_name))) continue;
+        else if (parse_int(buf, "<http_server_port>", http_server_port)) continue;
+        else if (parse_str(buf, "<socks5_user_name>", socks5_user_name, sizeof(socks5_user_name))) continue;
+        else if (parse_str(buf, "<socks5_user_passwd>", socks5_user_passwd, sizeof(socks5_user_passwd))) continue;
+        else msg_printf(NULL, MSG_ERROR, "PROXY_INFO::parse(): unrecognized: %s\n", buf);
+    }
+    return 0;
+}
+
+int PROXY_INFO::write(FILE* out) {
+   fprintf(out,
+       "<proxy_info>\n"
+       "%s"
+       "%s"
+       "    <socks_version>%d</socks_version>\n"
+       "    <socks_server_name>%s</socks_server_name>\n"
+       "    <socks_server_port>%d</socks_server_port>\n"
+       "    <http_server_name>%s</http_server_name>\n"
+       "    <http_server_port>%d</http_server_port>\n"
+       "    <socks5_user_name>%s</socks5_user_name>\n"
+       "    <socks5_user_passwd>%s</socks5_user_passwd>\n"
+       "</proxy_info>\n",
+       use_http_proxy?"    <use_http_proxy/>\n":"",
+       use_socks_proxy?"    <use_socks_proxy/>\n":"",
+       socks_version,
+       socks_server_name,
+       socks_server_port,
+       http_server_name,
+       http_server_port,
+       socks5_user_name,
+       socks5_user_passwd
+   );
+   return 0;
+}
+
+void PROXY_INFO::clear() {
+    use_http_proxy = false;
+    use_socks_proxy = false;
+    strcpy(socks_server_name, "");
+    strcpy(http_server_name, "");
+    socks_server_port = 80;
+    http_server_port = 80;
+    strcpy(socks5_user_name, "");
+    strcpy(socks5_user_passwd, "");
+    socks_version = 0;
+}
+
+PROXY::PROXY() {
+    strcpy(proxy_data,"");
+    proxy_state = PROXY_STATE_CONNECTING;
+    proxy_retval = 0;
+}
+
+void PROXY::init(char *dst_host, int port) {
+    strcpy(dest_serv_name, dst_host);
+    dest_serv_port = port;
+    proxy_state = PROXY_STATE_CONNECTING;
+}
+
+PROXY::~PROXY() {
+}
+
+int PROXY::set_proxy(PROXY_INFO *new_pi) {
+    pi.use_http_proxy = new_pi->use_http_proxy;
+    strcpy(pi.http_server_name, new_pi->http_server_name);
+    pi.http_server_port = new_pi->http_server_port;
+
+    pi.use_socks_proxy = new_pi->use_socks_proxy;
+    strcpy(pi.socks5_user_name, new_pi->socks5_user_name);
+    strcpy(pi.socks5_user_passwd, new_pi->socks5_user_passwd);
+    strcpy(pi.socks_server_name, new_pi->socks_server_name);
+    pi.socks_server_port = new_pi->socks_server_port;
+    pi.socks_version = new_pi->socks_version;
+
+    return 0;
+}
+
+char *PROXY::get_proxy_server_name(char *regular_server) {
+    if (pi.use_socks_proxy) return pi.socks_server_name;
+    else if (pi.use_http_proxy) return pi.http_server_name;
+    else return regular_server;
+}
+
+int PROXY::get_proxy_port(int regular_port) {
+    if (pi.use_socks_proxy) return pi.socks_server_port;
+    else if (pi.use_http_proxy) return pi.http_server_port;
+    else return regular_port;
+}
+
+int PROXY::proxy_failed(int failure_code) {
+    proxy_state = PROXY_STATE_DONE;
+    proxy_retval = failure_code;
+
+    return 0;
+}
+
+// Initialize proxy_data with a socks4 or socks5 connection request
+// see http://www.socks.nec.com/rfc/rfc1928.txt
+// see http://www.socks.nec.com/protocol/socks4.protocol
+// TODO: add support for GSSAPI authentication, IPv6 addresses, name -> IP resolution
+// One current problem is that the client may not fully read/write messages
+// to the server if buffers are full.  proxy_atomic_send is an attempt to
+// compensate, it should be fully implemented and tested if this becomes a
+// significant issue.  I'm not too worried though, since the messages are
+// always very small, and unlikely to cause space concerns (Eric Heien 3/26/04)
+
+// Check available methods on the socks server
+//
+int PROXY::socks_prepare_method_req(char *buf) {
+    int nbytes = 0;
+    char *marker = buf;
+
+    if (pi.socks_version != SOCKS_VERSION_5) return ERR_SOCKS_UNKNOWN_FAILURE;
+    
+    nbytes = 3;
+    *marker++ = SOCKS_VERSION_5;
+    if (*pi.socks5_user_name && *pi.socks5_user_passwd) {
+        *marker++ = 2; // 2 possible methods
+        *marker++ = SOCKS_AUTH_USER_PASS; // user/pass
+        nbytes++;
+    } else {
+        *marker++ = 1; // 1 possible method:
+    }
+    *marker++ = SOCKS_AUTH_NONE_NEEDED; // no authentication
+
+    return nbytes;
+}
+
+int PROXY::socks_prepare_user_pass(char *buf) {
+    int nbytes;
+    char *marker = buf;
+
+    if (pi.socks_version != SOCKS_VERSION_5) return ERR_SOCKS_UNKNOWN_FAILURE;
+
+    // Send user and password
+    *marker++ = SOCKS5_USER_SUBNEG_VERSION_1;
+    *marker++ = strlen(pi.socks5_user_name);
+    strncpy(marker, pi.socks5_user_name, strlen(pi.socks5_user_name));
+    marker += strlen(pi.socks5_user_name);
+    *marker++ = strlen(pi.socks5_user_passwd);
+    strncpy(marker, pi.socks5_user_passwd, strlen(pi.socks5_user_passwd));
+    nbytes = 1+1+strlen(pi.socks5_user_name)+1+strlen(pi.socks5_user_passwd);
+
+    return nbytes;
+}
+
+int PROXY::socks_prepare_connect_req(char *buf, int ns_port, int ip_addr, char *domain_name) {
+    int nbytes;
+    char *marker = buf, *p;
+
+    if (pi.socks_version == SOCKS_VERSION_4) {
+        *marker++ = SOCKS_VERSION_4;
+        *marker++ = 1;          // Request connection
+        p = (char*)&ns_port;    // to this port
+        for (int i=0;i<2;i++) *marker++ = *p++;
+        p = (char*)&ip_addr;    // at this IP address
+        for (int i=0;i<4;i++) *marker++ = *p++;
+        strncpy(marker, pi.socks5_user_name, strlen(pi.socks5_user_name));
+        nbytes = 1+1+2+4+strlen(pi.socks5_user_name);
+    } else if (pi.socks_version == SOCKS_VERSION_5) {
+        if (strlen(domain_name) > 255) return ERR_SOCKS_UNKNOWN_FAILURE;
+
+        *marker++ = SOCKS_VERSION_5;
+        *marker++ = 1;  // request connection
+        *marker++ = 0;  // reserved
+        nbytes = 3;
+
+        if (strlen(domain_name) > 0) {
+            nbytes += 2+strlen(domain_name);
+            *marker++ = SOCKS5_ADDR_TYPE_DOMAIN_NAME;
+            *marker++ = strlen(domain_name);
+            p = domain_name;
+            for (unsigned int i=0;i<strlen(domain_name);i++) *marker++ = *p++;
+        } else {
+            nbytes += 1+4;
+            *marker++ = SOCKS5_ADDR_TYPE_IPV4;
+            p = (char*)&ip_addr;
+            for (int i=0;i<4;i++) *marker++ = *p++;
+        }
+        p = (char*)&ns_port;
+        for (int i=0;i<2;i++) *marker++ = *p++;
+        nbytes += 2;
+    } else {
+        return ERR_SOCKS_UNKNOWN_FAILURE;
+    }
+
+    return nbytes;
+}
+
+int PROXY::socks_parse_method_ack(char *buf) {
+    // This parsing only makes sense in SOCKS version 5
+    if (pi.socks_version != SOCKS_VERSION_5) return ERR_SOCKS_UNKNOWN_FAILURE;
+
+    // The buffer should start with the version 5 identifier
+    if (buf[0] != SOCKS_VERSION_5) return ERR_SOCKS_UNKNOWN_SERVER_VERSION;
+
+    // Depending on the method, move to a different state or return an error
+    switch (buf[1]) {
+        case SOCKS_AUTH_NONE_NEEDED:
+            proxy_state = PROXY_STATE_SOCKS_SEND_CONNECT_REQ;
+            break;
+        case SOCKS_AUTH_USER_PASS:
+            proxy_state = PROXY_STATE_SOCKS_SEND_USER_PASS;
+            break;
+        case SOCKS_AUTH_GSSAPI:
+        case SOCKS_AUTH_NONE_ACCEPTABLE:
+        default:
+            return ERR_SOCKS_UNSUPPORTED;
+    }
+
+    return 0;
+}
+
+int PROXY::socks_parse_user_pass_ack(char *buf) {
+    // This parsing only makes sense in SOCKS version 5
+    if (pi.socks_version != SOCKS_VERSION_5) return ERR_SOCKS_UNKNOWN_FAILURE;
+
+    // The buffer should start with the subnegotiation version identifier
+    if (buf[0] != SOCKS5_USER_SUBNEG_VERSION_1) return ERR_SOCKS_UNKNOWN_SERVER_VERSION;
+
+    // 0 indicates success, otherwise we assume a bad user/password
+    if (buf[1] != 0) return ERR_SOCKS_BAD_USER_PASS;
+
+    proxy_state = PROXY_STATE_SOCKS_SEND_CONNECT_REQ;
+
+    return 0;
+}
+
+int PROXY::socks_parse_connect_ack(char *buf) {
+    switch (pi.socks_version) {
+        case SOCKS_VERSION_4:
+            if (buf[0] != 0) return ERR_SOCKS_UNKNOWN_FAILURE;
+
+            switch (buf[1]) {
+                case SOCKS4_REQ_GRANTED:
+                    proxy_state = PROXY_STATE_DONE;
+                    proxy_retval = 0;
+                    break;
+                case SOCKS4_REQ_REJECTED:
+	                return ERR_SOCKS_REQUEST_FAILED;
+                case SOCKS4_REQ_NO_IDENTD:
+	                return ERR_SOCKS_REQUEST_FAILED;
+                case SOCKS4_REQ_BAD_USER_PASS:
+	                return ERR_SOCKS_BAD_USER_PASS;
+                default:
+                    return ERR_SOCKS_UNKNOWN_FAILURE;
+            }
+            break;
+        case SOCKS_VERSION_5:
+            if (buf[0] != SOCKS_VERSION_5) return ERR_SOCKS_UNKNOWN_FAILURE;
+            switch (buf[1]) {
+                case SOCKS5_CONNECTION_SUCCEEDED:
+                    proxy_state = PROXY_STATE_DONE;
+                    proxy_retval = 0;
+                    break;
+                case SOCKS5_ERR_SERVER_FAILURE:
+                    return ERR_SOCKS_UNKNOWN_FAILURE;
+                case SOCKS5_ERR_NOT_ALLOWED:
+                    return ERR_SOCKS_REQUEST_FAILED;
+                case SOCKS5_ERR_NETWORK_UNREACHABLE:
+                    return ERR_SOCKS_CANT_REACH_HOST;
+                case SOCKS5_ERR_HOST_UNREACHABLE:
+                    return ERR_SOCKS_CANT_REACH_HOST;
+                case SOCKS5_ERR_CONNECTION_REFUSED:
+                    return ERR_SOCKS_CONN_REFUSED;
+                case SOCKS5_ERR_TTL_EXPIRED:
+                    return ERR_SOCKS_UNKNOWN_FAILURE;
+                case SOCKS5_ERR_COMMAND_UNSUPPORTED:
+                    return ERR_SOCKS_UNKNOWN_FAILURE;
+                case SOCKS5_ERR_ADDR_TYPE_UNSUPPORTED:
+                    return ERR_SOCKS_UNKNOWN_FAILURE;
+                default:
+                    return ERR_SOCKS_UNKNOWN_FAILURE;
+            }
+            break;
+        default:
+            return ERR_SOCKS_UNKNOWN_FAILURE;
+    }
+
+    return 0;
+}
+
+bool PROXY::proxy_negotiated() {
+    return (proxy_state == PROXY_STATE_DONE);
+}
+
+bool PROXY::proxy_poll() {
+    int n, retval, ip_addr, nbytes;
+    bool action = false;
+    char buf[256];
+
+    ScopeMessages scope_messages(log_messages, ClientMessages::DEBUG_PROXY);
+
+    switch(proxy_state) {
+        case PROXY_STATE_CONNECTING:
+            if (pi.use_socks_proxy) {
+                if (pi.socks_version == SOCKS_VERSION_4) {
+                    scope_messages.printf("PROXY::proxy_poll(): attempting SOCKS4 connect\n");
+                    proxy_state = PROXY_STATE_SOCKS_SEND_CONNECT_REQ;
+                } else if (pi.socks_version == SOCKS_VERSION_5) {
+                    scope_messages.printf("PROXY::proxy_poll(): attempting SOCKS5 connect\n");
+                    proxy_state = PROXY_STATE_SOCKS_SEND_METHOD_REQ;
+                } else {
+                    scope_messages.printf("PROXY::proxy_poll(): SOCKS proxy ignored - unknown version: %d\n", pi.socks_version);
+                    proxy_state = PROXY_STATE_DONE;
+                }
+            } else {
+                scope_messages.printf("PROXY::proxy_poll(): SOCKS proxy ignored - user pref\n");
+                proxy_state = PROXY_STATE_DONE;
+            }
+            
+            action = true;
+            break;
+        case PROXY_STATE_SOCKS_SEND_METHOD_REQ:
+            nbytes = socks_prepare_method_req(proxy_data);
+            scope_messages.printf("PROXY::proxy_poll(): sending method request\n");
+            if (nbytes <= 0) {
+                proxy_failed(ERR_SOCKS_UNKNOWN_FAILURE);
+            } else {
+                n = send(socket, proxy_data, nbytes, 0);
+
+                if (n != nbytes) proxy_failed(ERR_SOCKS_UNKNOWN_FAILURE);
+                else proxy_state = PROXY_STATE_SOCKS_PARSE_METHOD_ACK;
+            }
+            action = true;
+            break;
+        case PROXY_STATE_SOCKS_PARSE_METHOD_ACK:
+            if (io_ready) {
+                nbytes = proxy_read_reply(socket, buf, 256);
+                if (nbytes == 0) break;
+                scope_messages.printf("PROXY::proxy_poll(): parsing method request ack\n");
+                retval = socks_parse_method_ack(buf);
+                if (retval) proxy_failed (retval);
+                action = true;
+            }
+            break;
+        case PROXY_STATE_SOCKS_SEND_USER_PASS:
+            scope_messages.printf("PROXY::proxy_poll(): sending user/pass\n");
+            nbytes = socks_prepare_user_pass(proxy_data);
+            if (nbytes <= 0) {
+                proxy_failed(ERR_SOCKS_UNKNOWN_FAILURE);
+            } else {
+                n = send(socket, proxy_data, nbytes, 0);
+                if (n != nbytes) proxy_failed(ERR_SOCKS_UNKNOWN_FAILURE);
+                else proxy_state = PROXY_STATE_SOCKS_PARSE_USER_PASS_ACK;
+            }
+            action = true;
+            break;
+        case PROXY_STATE_SOCKS_PARSE_USER_PASS_ACK:
+            if (io_ready) {
+                action = true;
+                nbytes = proxy_read_reply(socket, buf, 256);
+                if (nbytes == 0) break;
+                scope_messages.printf("PROXY::proxy_poll(): parsing user/pass ack\n");
+                retval = socks_parse_user_pass_ack(buf);
+                if (retval) proxy_failed(retval);
+            }
+            break;
+        case PROXY_STATE_SOCKS_SEND_CONNECT_REQ:
+            retval = get_ip_addr(ip_addr);
+            if (retval) {
+                proxy_failed(retval);
+                break;
+            }
+            scope_messages.printf("PROXY::proxy_poll(): sending connect request\n");
+            nbytes = socks_prepare_connect_req(proxy_data, htons(dest_serv_port), ip_addr, dest_serv_name);
+            if (nbytes <= 0) {
+                proxy_failed(ERR_SOCKS_UNKNOWN_FAILURE);
+            } else {
+                n = send(socket, proxy_data, nbytes, 0);
+                if (n != nbytes) proxy_failed(ERR_SOCKS_UNKNOWN_FAILURE);
+                else proxy_state = PROXY_STATE_SOCKS_PARSE_CONNECT_ACK;
+            }
+            action = true;
+            break;
+        case PROXY_STATE_SOCKS_PARSE_CONNECT_ACK:
+            if (io_ready) {
+                action = true;
+                nbytes = proxy_read_reply(socket, buf, 256);
+                if (nbytes == 0) break;
+                scope_messages.printf("PROXY::proxy_poll(): parsing connect ack\n");
+                retval = socks_parse_connect_ack(buf);
+                if (retval) {
+                    proxy_failed(retval);
+                }
+            }
+            break;
+    }
+    return action;
+}
+
diff --git a/client/proxy.h b/client/proxy.h
new file mode 100644
index 0000000000..7c00dce371
--- /dev/null
+++ b/client/proxy.h
@@ -0,0 +1,109 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved.
+//
+// Contributor(s):
+//
+
+#ifndef _PROXY_
+#define _PROXY_
+
+#include "net_xfer.h"
+
+struct PROXY_INFO {
+    bool use_http_proxy;
+    bool use_socks_proxy;
+    int socks_version;
+    char socks_server_name[256];
+    char http_server_name[256];
+    int socks_server_port;
+    int http_server_port;
+    char socks5_user_name[256];
+    char socks5_user_passwd[256];
+
+    int parse(FILE*);
+    int write(FILE*);
+    void clear();
+};
+
+class PROXY : public NET_XFER {
+public:
+    PROXY();
+    ~PROXY();
+
+    PROXY_INFO pi;
+    char proxy_data[256];
+    int proxy_state;
+    int proxy_retval;
+    char dest_serv_name[256];
+    int dest_serv_port;
+
+    void init(char *dst_host, int port);
+    bool proxy_poll();
+    bool proxy_negotiated();
+    int proxy_failed(int failure_code);
+    char *get_proxy_server_name(char *regular_server);
+    int get_proxy_port(int regular_port);
+    int set_proxy(PROXY_INFO *new_pd);
+    int socks_prepare_method_req(char *buf);
+    int socks_prepare_user_pass(char *buf);
+    int socks_prepare_connect_req(char *buf, int ns_port, int ip_addr, char *domain_name);
+    int socks_parse_method_ack(char *buf);
+    int socks_parse_user_pass_ack(char *buf);
+    int socks_parse_connect_ack(char *buf);
+};
+
+void print_buf(char *buf, int n);
+
+#define PROXY_STATE_CONNECTING                0
+#define PROXY_STATE_SOCKS_SEND_METHOD_REQ     1
+#define PROXY_STATE_SOCKS_PARSE_METHOD_ACK    2
+#define PROXY_STATE_SOCKS_SEND_USER_PASS      3
+#define PROXY_STATE_SOCKS_PARSE_USER_PASS_ACK 4
+#define PROXY_STATE_SOCKS_SEND_CONNECT_REQ    5
+#define PROXY_STATE_SOCKS_PARSE_CONNECT_ACK   6
+#define PROXY_STATE_DONE                      7
+
+// SOCKS #defines
+#define SOCKS_VERSION_4             0x04
+#define SOCKS_VERSION_5             0x05
+
+#define SOCKS_AUTH_NONE_NEEDED      0x00
+#define SOCKS_AUTH_GSSAPI           0x01
+#define SOCKS_AUTH_USER_PASS        0x02
+#define SOCKS_AUTH_NONE_ACCEPTABLE  0xFF
+
+#define SOCKS4_REQ_GRANTED          90
+#define SOCKS4_REQ_REJECTED         91
+#define SOCKS4_REQ_NO_IDENTD        92
+#define SOCKS4_REQ_BAD_USER_PASS    93
+
+#define SOCKS5_ADDR_TYPE_IPV4        0x01
+#define SOCKS5_ADDR_TYPE_DOMAIN_NAME 0x03
+#define SOCKS5_ADDR_TYPE_IPV6        0x04
+
+#define SOCKS5_CONNECTION_SUCCEEDED      0x00
+#define SOCKS5_ERR_SERVER_FAILURE        0x01
+#define SOCKS5_ERR_NOT_ALLOWED           0x02
+#define SOCKS5_ERR_NETWORK_UNREACHABLE   0x03
+#define SOCKS5_ERR_HOST_UNREACHABLE      0x04
+#define SOCKS5_ERR_CONNECTION_REFUSED    0x05
+#define SOCKS5_ERR_TTL_EXPIRED           0x06
+#define SOCKS5_ERR_COMMAND_UNSUPPORTED   0x07
+#define SOCKS5_ERR_ADDR_TYPE_UNSUPPORTED 0x08
+
+#define SOCKS5_USER_SUBNEG_VERSION_1     1
+
+#endif
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index 8bb5d3fdb8..79afadb2b0 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -215,11 +215,7 @@ int SCHEDULER_OP::start_rpc() {
 
     scope_messages.printf_file(SCHED_OP_REQUEST_FILE, "req:");
 
-    if (gstate.use_http_proxy) {
-        http_op.use_http_proxy = true;
-        safe_strcpy(http_op.proxy_server_name, gstate.proxy_server_name);
-        http_op.proxy_server_port = gstate.proxy_server_port;
-    }
+    http_op.set_proxy(&gstate.pi);
     retval = http_op.init_post(
         scheduler_url, SCHED_OP_REQUEST_FILE,
         SCHED_OP_RESULT_FILE
@@ -241,11 +237,7 @@ int SCHEDULER_OP::init_master_fetch(PROJECT* p) {
 
     project = p;
     scope_messages.printf("SCHEDULER_OP::init_master_fetch(): Fetching master file for %s\n", project->master_url);
-    if (gstate.use_http_proxy) {
-        http_op.use_http_proxy = true;
-        safe_strcpy(http_op.proxy_server_name, gstate.proxy_server_name);
-        http_op.proxy_server_port = gstate.proxy_server_port;
-    }
+    http_op.set_proxy(&gstate.pi);
     retval = http_op.init_get(project->master_url, MASTER_FILE_NAME, true);
     if (retval) return retval;
     retval = http_ops->insert(&http_op);
diff --git a/lib/error_numbers.h b/lib/error_numbers.h
index 9eb6e6168d..2b8a335b77 100755
--- a/lib/error_numbers.h
+++ b/lib/error_numbers.h
@@ -117,3 +117,11 @@
 #define ERR_SEMCTL          -166
 #define ERR_SEMOP           -167
 #define ERR_FTOK            -168
+#define ERR_SOCKS_UNKNOWN_FAILURE -169
+#define ERR_SOCKS_REQUEST_FAILED  -170
+#define ERR_SOCKS_BAD_USER_PASS   -171
+#define ERR_SOCKS_UNKNOWN_SERVER_VERSION -172
+#define ERR_SOCKS_UNSUPPORTED     -173
+#define ERR_SOCKS_CANT_REACH_HOST -174
+#define ERR_SOCKS_CONN_REFUSED    -175
+