From 0e170eb17d9a6c3346373dbb5f0db324a0a60eef Mon Sep 17 00:00:00 2001
From: Karl Chen <quarl@quarl.org>
Date: Wed, 15 Oct 2003 09:15:50 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2486
---
 configure              |  36 +++----
 lib/Makefile.in        |  27 +++--
 lib/countries.C        | 233 -----------------------------------------
 lib/countries.h        |   2 -
 sched/Makefile.in      |  15 ++-
 test/Makefile.in       |   8 +-
 tools/Makefile.in      |  97 +++++------------
 tools/country_select.C |  36 -------
 8 files changed, 64 insertions(+), 390 deletions(-)
 delete mode 100644 lib/countries.C
 delete mode 100644 lib/countries.h
 delete mode 100644 tools/country_select.C

diff --git a/configure b/configure
index 0ce420dba5..52b2929449 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.49 .
+# From configure.ac Revision: 1.52 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for BOINC 2.04.
+# Generated by GNU Autoconf 2.57 for BOINC 2.05.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -287,8 +287,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='BOINC'
 PACKAGE_TARNAME='boinc'
-PACKAGE_VERSION='2.04'
-PACKAGE_STRING='BOINC 2.04'
+PACKAGE_VERSION='2.05'
+PACKAGE_STRING='BOINC 2.05'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="lib/shmem.C"
@@ -814,7 +814,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures BOINC 2.04 to adapt to many kinds of systems.
+\`configure' configures BOINC 2.05 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -881,7 +881,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BOINC 2.04:";;
+     short | recursive ) echo "Configuration of BOINC 2.05:";;
    esac
   cat <<\_ACEOF
 
@@ -972,7 +972,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-BOINC configure 2.04
+BOINC configure 2.05
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1007,7 +1007,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by BOINC $as_me 2.04, which was
+It was created by BOINC $as_me 2.05, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -1344,7 +1344,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-echo "--- Configuring BOINC 2.04 ---"
+echo "--- Configuring BOINC 2.05 ---"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1693,7 +1693,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=boinc
- VERSION=2.04
+ VERSION=2.05
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1826,9 +1826,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
-MAJOR_VERSION=`echo 2.04 | sed 's/\..*//'`
+MAJOR_VERSION=`echo 2.05 | sed 's/\..*//'`
 
-MINOR_VERSION=`echo 2.04 | sed 's/.*\.0*//'`
+MINOR_VERSION=`echo 2.05 | sed 's/.*\.0*//'`
 
 
 
@@ -1846,7 +1846,7 @@ cat >>confdefs.h <<_ACEOF
 #define HOSTTYPE "$host"
 _ACEOF
 
-CLIENT_BIN_FILENAME=boinc_2.04_$host${EXEEXT}
+CLIENT_BIN_FILENAME=boinc_2.05_$host${EXEEXT}
 
 TOP_BUILD_DIR=`pwd`
 
@@ -1878,8 +1878,6 @@ fi
 
 
 
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7798,7 +7796,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by BOINC $as_me 2.04, which was
+This file was extended by BOINC $as_me 2.05, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7861,7 +7859,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-BOINC config.status 2.04
+BOINC config.status 2.05
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -8776,10 +8774,10 @@ if test "$no_create" != yes; then
 fi
 
 
-echo "--- Configured BOINC 2.04 ---"
+echo "--- Configured BOINC 2.05 ---"
 
 
-test/test_sanity.py || (
+$TOP_SOURCE_DIR/test/test_sanity.py || (
     cat <<EOF
 
 ******************************************************************************
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4d23b2b296..59795d5dab 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -180,7 +180,6 @@ libboinc_a_SOURCES = \
         ../api/boinc_api.C			\
         ../api/mfile.C				\
         app_ipc.C				\
-        countries.C				\
         parse.C					\
 	xml_util.C                              \
         filesys.C				\
@@ -190,7 +189,6 @@ libboinc_a_SOURCES = \
         md5_file.C				\
 	shmem.C					\
 	app_ipc.h				\
-	countries.h				\
 	crypt.h					\
 	error_numbers.h				\
 	filesys.h				\
@@ -225,9 +223,9 @@ LIBRARIES = $(noinst_LIBRARIES)
 libboinc_a_AR = $(AR) cru
 libboinc_a_LIBADD =
 am_libboinc_a_OBJECTS = boinc_api.$(OBJEXT) mfile.$(OBJEXT) \
-	app_ipc.$(OBJEXT) countries.$(OBJEXT) parse.$(OBJEXT) \
-	xml_util.$(OBJEXT) filesys.$(OBJEXT) language.$(OBJEXT) \
-	util.$(OBJEXT) md5.$(OBJEXT) md5_file.$(OBJEXT) shmem.$(OBJEXT)
+	app_ipc.$(OBJEXT) parse.$(OBJEXT) xml_util.$(OBJEXT) \
+	filesys.$(OBJEXT) language.$(OBJEXT) util.$(OBJEXT) \
+	md5.$(OBJEXT) md5_file.$(OBJEXT) shmem.$(OBJEXT)
 libboinc_a_OBJECTS = $(am_libboinc_a_OBJECTS)
 EXTRA_PROGRAMS = msg_test$(EXEEXT) synch_test$(EXEEXT)
 bin_PROGRAMS = md5_test$(EXEEXT) shmem_test$(EXEEXT) crypt_prog$(EXEEXT)
@@ -263,15 +261,15 @@ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/app_ipc.Po ./$(DEPDIR)/boinc_api.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/countries.Po ./$(DEPDIR)/crypt.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crypt_prog.Po ./$(DEPDIR)/filesys.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/language.Po ./$(DEPDIR)/md5.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/md5_file.Po ./$(DEPDIR)/md5_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mfile.Po ./$(DEPDIR)/msg_queue.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/msg_test.Po ./$(DEPDIR)/parse.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/shmem.Po ./$(DEPDIR)/shmem_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/synch.Po ./$(DEPDIR)/synch_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/util.Po ./$(DEPDIR)/xml_util.Po
+@AMDEP_TRUE@	./$(DEPDIR)/crypt.Po ./$(DEPDIR)/crypt_prog.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/filesys.Po ./$(DEPDIR)/language.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/md5.Po ./$(DEPDIR)/md5_file.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/md5_test.Po ./$(DEPDIR)/mfile.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/msg_queue.Po ./$(DEPDIR)/msg_test.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/parse.Po ./$(DEPDIR)/shmem.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/shmem_test.Po ./$(DEPDIR)/synch.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/synch_test.Po ./$(DEPDIR)/util.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xml_util.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -355,7 +353,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/app_ipc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_api.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/countries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt_prog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesys.Po@am__quote@
diff --git a/lib/countries.C b/lib/countries.C
deleted file mode 100644
index 2a33ddcd18..0000000000
--- a/lib/countries.C
+++ /dev/null
@@ -1,233 +0,0 @@
-// list of countries taken from http://www.cia.gov
-
-#include "countries.h"
-
-char *countries[NUM_COUNTRIES] = {
-    "None or International",
-    "United States",
-    "Afghanistan",
-    "Albania",
-    "Algeria",
-    "American Samoa",
-    "Andorra",
-    "Angola",
-    "Anguilla",
-    "Antarctica",
-    "Antigua and Barbuda",
-    "Argentina",
-    "Armenia",
-    "Aruba",
-    "Australia",
-    "Austria",
-    "Azerbaijan",
-    "Bahamas, The",
-    "Bahrain",
-    "Bangladesh",
-    "Barbados",
-    "Belarus",
-    "Belgium",
-    "Belize",
-    "Benin",
-    "Bermuda",
-    "Bhutan",
-    "Bolivia",
-    "Bosnia and Herzegovina",
-    "Botswana",
-    "Brazil",
-    "British Virgin Islands",
-    "Brunei",
-    "Bulgaria",
-    "Burkina Faso",
-    "Burundi",
-    "Cambodia",
-    "Cameroon",
-    "Canada",
-    "Cape Verde",
-    "Cayman Islands",
-    "Central African Republic",
-    "Chad",
-    "Channel Islands",
-    "Chile",
-    "China",
-    "Colombia",
-    "Comoros",
-    "Congo, Democratic Republic of the",
-    "Congo, Republic of the",
-    "Cook Islands",
-    "Costa Rica",
-    "Cote d'Ivoire",
-    "Croatia",
-    "Cuba",
-    "Cyprus",
-    "Czech Republic",
-    "Denmark",
-    "Djibouti",
-    "Dominica",
-    "Dominican Republic",
-    "East Timor",
-    "Ecuador",
-    "Egypt",
-    "El Salvador",
-    "Equatorial Guinea",
-    "Eritrea",
-    "Estonia",
-    "Ethiopia",
-    "Falkland Islands",
-    "Faroe Islands",
-    "Fiji",
-    "Finland",
-    "France",
-    "French Guiana",
-    "French Polynesia",
-    "Gabon",
-    "Gambia, The",
-    "Gaza Strip",
-    "Georgia",
-    "Germany",
-    "Ghana",
-    "Gibraltar",
-    "Greece",
-    "Greenland",
-    "Grenada",
-    "Guadeloupe",
-    "Guam",
-    "Guatemala",
-    "Guinea",
-    "Guinea-Bissau",
-    "Guyana",
-    "Haiti",
-    "Honduras",
-    "Hong Kong",
-    "Hungary",
-    "Iceland",
-    "India",
-    "Indonesia",
-    "Iran",
-    "Iraq",
-    "Ireland",
-    "Israel",
-    "Italy",
-    "Jamaica",
-    "Japan",
-    "Jordan",
-    "Kazakhstan",
-    "Korea, North",
-    "Korea, South",
-    "Kenya",
-    "Kiribati",
-    "Kuwait",
-    "Kyrgyzstan",
-    "Laos",
-    "Latvia",
-    "Lebanon",
-    "Lesotho",
-    "Liberia",
-    "Libya",
-    "Liechtenstein",
-    "Lithuania",
-    "Luxembourg",
-    "Macau",
-    "Macedonia, The Former Yugoslav Republic of",
-    "Madagascar",
-    "Malawi",
-    "Malaysia",
-    "Maldives",
-    "Mali",
-    "Malta",
-    "Marshall Islands",
-    "Martinique",
-    "Mauritania",
-    "Mexico",
-    "Micronesia",
-    "Moldova",
-    "Monaco",
-    "Mongolia",
-    "Montserrat",
-    "Morocco",
-    "Mozambique",
-    "Namibia",
-    "Nauru",
-    "Nepal",
-    "Netherlands",
-    "Netherlands Antilles",
-    "New Caledonia",
-    "New Zealand",
-    "Nicaragua",
-    "Niger",
-    "Nigeria",
-    "Niue",
-    "Northern Mariana Islands",
-    "Norway",
-    "Oman",
-    "Pakistan",
-    "Palau",
-    "Panama",
-    "Papua New Guinea",
-    "Paraguay",
-    "Peru",
-    "Philippines",
-    "Pitcairn Islands",
-    "Poland",
-    "Portugal",
-    "Puerto Rico",
-    "Qatar",
-    "Reunion",
-    "Romania",
-    "Russia",
-    "Rwanda",
-    "Saint Kitts and Nevis",
-    "Saint Lucia",
-    "Saint Pierre and Miquelon",
-    "Saint Vincent and the Grenadines",
-    "Samoa",
-    "San Marino",
-    "Sao Tome and Principe",
-    "Saudi Arabia",
-    "Senegal",
-    "Serbia and Montenegro",
-    "Seychelles",
-    "Sierra Leone",
-    "Singapore",
-    "Slovakia",
-    "Slovenia",
-    "Solomon Islands",
-    "Somalia",
-    "South Africa",
-    "Spain",
-    "Sri Lanka",
-    "Sudan",
-    "Suriname",
-    "Swaziland",
-    "Sweden",
-    "Switzerland",
-    "Syria",
-    "Taiwan",
-    "Tajikistan",
-    "Tanzania",
-    "Thailand",
-    "Togo",
-    "Tokelau",
-    "Tonga",
-    "Trinidad and Tobago",
-    "Tunisia",
-    "Turkey",
-    "Turkmenistan",
-    "Turks and Caicos Islands",
-    "Tuvalu",
-    "Uganda",
-    "Ukraine",
-    "United Arab Emirates",
-    "United Kingdom",
-    "Uruguay",
-    "Uzbekistan",
-    "Vanuatu",
-    "Venezuela",
-    "Vietnam",
-    "Virgin Islands",
-    "Wallis and Futuna",
-    "West Bank",
-    "Western Sahara",
-    "Yemen",
-    "Zambia",
-    "Zimbabwe"
-};
diff --git a/lib/countries.h b/lib/countries.h
deleted file mode 100644
index db32eda3ca..0000000000
--- a/lib/countries.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NUM_COUNTRIES   227
-extern char *countries[NUM_COUNTRIES];
diff --git a/sched/Makefile.in b/sched/Makefile.in
index eb3d5c0e51..2bf169d8da 100644
--- a/sched/Makefile.in
+++ b/sched/Makefile.in
@@ -194,7 +194,7 @@ libsched_a_SOURCES = \
         sched_config.C				\
 	sched_messages.C			\
 	../db/boinc_db.C			\
-	../db/db_base.C			\
+	../db/db_base.C				\
         ../lib/util.C				\
         ../lib/crypt.C				\
         ../lib/parse.C				\
@@ -247,9 +247,6 @@ db_dump_DEPENDENCIES = $(LIB_SCHED)
 update_stats_SOURCES = update_stats.C
 update_stats_DEPENDENCIES = $(LIB_SCHED)
 
-
-# start_servers_SOURCES = start_servers.C
-# start_servers_DEPENDENCIES = $(LIB_SCHED)
 file_upload_handler_SOURCES = file_upload_handler.C
 file_upload_handler_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
 file_upload_handler_LDADD = $(LDADD) $(RSA_LIBS)
@@ -1081,11 +1078,13 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am
 $(LIBRSA):
 	cd $(top_builddir)/RSAEuro/source; ${MAKE} librsaeuro.a
 
-start:  
-	ln -s $(srcdir)/start start
+.PHONY: PHONY-start
 
-status stop: 
-	ln -s start $@
+PHONY-start:
+	@test -f start || ln -s $(srcdir)/start start && test -f start
+
+status stop: PHONY-start
+	@test -f $@ || ln -s start $@ && test -f $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/test/Makefile.in b/test/Makefile.in
index 715b147a0d..34d4d9c3c0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -185,10 +185,10 @@ TESTS = test_sanity.py				\
 
 # TODO: phase out php stuff
 EXTRA_DIST = \
-        *.xml *wu *result *output *input			\
-	test*.py						\
-	db_def_to_php *.php version.inc.in boinc_db.inc 	\
-	test*.inc init.inc boinc_db.inc cgiserver.py
+        *.xml *wu *result *output *input		\
+	test*.py cgiserver.py fake_php.py testproxy	\
+	db_def_to_php *.php version.inc.in boinc_db.inc	\
+	test*.inc init.inc boinc_db.inc 
 
 subdir = test
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8e12167380..34cb157209 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -170,7 +170,7 @@ AM_CPPFLAGS = \
 # programs linking to it:
 LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a
 
-bin_PROGRAMS = create_work old_add country_select sign_executable
+bin_PROGRAMS = create_work sign_executable
 
 EXTRA_DIST = make_project add update_versions dbcheck_files_exist upgrade
 
@@ -194,24 +194,23 @@ create_work_SOURCES = \
 create_work_DEPENDENCIES = $(LIBRSA)
 create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
 
-old_add_SOURCES = \
-    add.C					\
-    backend_lib.C				\
-    process_result_template.C			\
-    ../lib/md5_file.C				\
-    ../lib/md5.c				\
-    ../lib/parse.C				\
-    ../lib/util.C				\
-    ../db/boinc_db.C				\
-    ../db/db_base.C				\
-    ../lib/crypt.C				\
-    ../sched/sched_config.C			\
-    backend_lib.h
 
+# old_add_SOURCES =				\
+#     add.C					\
+#     backend_lib.C				\
+#     process_result_template.C			\
+#     ../lib/md5_file.C				\
+#     ../lib/md5.c				\
+#     ../lib/parse.C				\
+#     ../lib/util.C				\
+#     ../db/boinc_db.C				\
+#     ../db/db_base.C				\
+#     ../lib/crypt.C				\
+#     ../sched/sched_config.C			\
+#     backend_lib.h
 
-old_add_DEPENDENCIES = $(LIBRSA)
-old_add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
-
+# old_add_DEPENDENCIES = $(LIBRSA)
+# old_add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
 sign_executable_SOURCES = \
         sign_executable.C			\
         ../lib/md5_file.C			\
@@ -221,33 +220,19 @@ sign_executable_SOURCES = \
 
 sign_executable_DEPENDENCIES = $(LIBRSA)
 sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS)
-
-country_select_SOURCES = country_select.C ../lib/countries.C
 subdir = tools
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = boinc_path_config.py
-bin_PROGRAMS = create_work$(EXEEXT) old_add$(EXEEXT) \
-	country_select$(EXEEXT) sign_executable$(EXEEXT)
+bin_PROGRAMS = create_work$(EXEEXT) sign_executable$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_country_select_OBJECTS = country_select.$(OBJEXT) countries.$(OBJEXT)
-country_select_OBJECTS = $(am_country_select_OBJECTS)
-country_select_LDADD = $(LDADD)
-country_select_DEPENDENCIES =
-country_select_LDFLAGS =
 am_create_work_OBJECTS = create_work.$(OBJEXT) backend_lib.$(OBJEXT) \
 	process_result_template.$(OBJEXT) md5_file.$(OBJEXT) \
 	md5.$(OBJEXT) parse.$(OBJEXT) util.$(OBJEXT) boinc_db.$(OBJEXT) \
 	db_base.$(OBJEXT) crypt.$(OBJEXT) sched_config.$(OBJEXT)
 create_work_OBJECTS = $(am_create_work_OBJECTS)
 create_work_LDFLAGS =
-am_old_add_OBJECTS = add.$(OBJEXT) backend_lib.$(OBJEXT) \
-	process_result_template.$(OBJEXT) md5_file.$(OBJEXT) \
-	md5.$(OBJEXT) parse.$(OBJEXT) util.$(OBJEXT) boinc_db.$(OBJEXT) \
-	db_base.$(OBJEXT) crypt.$(OBJEXT) sched_config.$(OBJEXT)
-old_add_OBJECTS = $(am_old_add_OBJECTS)
-old_add_LDFLAGS =
 am_sign_executable_OBJECTS = sign_executable.$(OBJEXT) \
 	md5_file.$(OBJEXT) md5.$(OBJEXT) crypt.$(OBJEXT)
 sign_executable_OBJECTS = $(am_sign_executable_OBJECTS)
@@ -256,12 +241,11 @@ sign_executable_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/add.Po ./$(DEPDIR)/backend_lib.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/boinc_db.Po ./$(DEPDIR)/countries.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/country_select.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/create_work.Po ./$(DEPDIR)/crypt.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/db_base.Po ./$(DEPDIR)/md5.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/md5_file.Po ./$(DEPDIR)/parse.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backend_lib.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/boinc_db.Po ./$(DEPDIR)/create_work.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/crypt.Po ./$(DEPDIR)/db_base.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/md5.Po ./$(DEPDIR)/md5_file.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/parse.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/process_result_template.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/sched_config.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/sign_executable.Po ./$(DEPDIR)/util.Po
@@ -274,10 +258,9 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(country_select_SOURCES) $(create_work_SOURCES) \
-	$(old_add_SOURCES) $(sign_executable_SOURCES)
+DIST_SOURCES = $(create_work_SOURCES) $(sign_executable_SOURCES)
 DIST_COMMON = $(top_srcdir)/Makefile.incl Makefile.am Makefile.in
-SOURCES = $(country_select_SOURCES) $(create_work_SOURCES) $(old_add_SOURCES) $(sign_executable_SOURCES)
+SOURCES = $(create_work_SOURCES) $(sign_executable_SOURCES)
 
 all: all-am
 
@@ -314,10 +297,6 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-countries.$(OBJEXT): ../lib/countries.C
-country_select$(EXEEXT): $(country_select_OBJECTS) $(country_select_DEPENDENCIES) 
-	@rm -f country_select$(EXEEXT)
-	$(CXXLINK) $(country_select_LDFLAGS) $(country_select_OBJECTS) $(country_select_LDADD) $(LIBS)
 md5_file.$(OBJEXT): ../lib/md5_file.C
 md5.$(OBJEXT): ../lib/md5.c
 parse.$(OBJEXT): ../lib/parse.C
@@ -329,9 +308,6 @@ sched_config.$(OBJEXT): ../sched/sched_config.C
 create_work$(EXEEXT): $(create_work_OBJECTS) $(create_work_DEPENDENCIES) 
 	@rm -f create_work$(EXEEXT)
 	$(CXXLINK) $(create_work_LDFLAGS) $(create_work_OBJECTS) $(create_work_LDADD) $(LIBS)
-old_add$(EXEEXT): $(old_add_OBJECTS) $(old_add_DEPENDENCIES) 
-	@rm -f old_add$(EXEEXT)
-	$(CXXLINK) $(old_add_LDFLAGS) $(old_add_OBJECTS) $(old_add_LDADD) $(LIBS)
 sign_executable$(EXEEXT): $(sign_executable_OBJECTS) $(sign_executable_DEPENDENCIES) 
 	@rm -f sign_executable$(EXEEXT)
 	$(CXXLINK) $(sign_executable_LDFLAGS) $(sign_executable_OBJECTS) $(sign_executable_LDADD) $(LIBS)
@@ -342,11 +318,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_lib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_db.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/countries.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/country_select.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create_work.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_base.Po@am__quote@
@@ -383,28 +356,6 @@ distclean-depend:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
 
-countries.o: ../lib/countries.C
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT countries.o -MD -MP -MF "$(DEPDIR)/countries.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o countries.o `test -f '../lib/countries.C' || echo '$(srcdir)/'`../lib/countries.C; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/countries.Tpo" "$(DEPDIR)/countries.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/countries.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/countries.C' object='countries.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/countries.Po' tmpdepfile='$(DEPDIR)/countries.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o countries.o `test -f '../lib/countries.C' || echo '$(srcdir)/'`../lib/countries.C
-
-countries.obj: ../lib/countries.C
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT countries.obj -MD -MP -MF "$(DEPDIR)/countries.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o countries.obj `if test -f '../lib/countries.C'; then $(CYGPATH_W) '../lib/countries.C'; else $(CYGPATH_W) '$(srcdir)/../lib/countries.C'`; \
-@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/countries.Tpo" "$(DEPDIR)/countries.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/countries.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../lib/countries.C' object='countries.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/countries.Po' tmpdepfile='$(DEPDIR)/countries.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o countries.obj `if test -f '../lib/countries.C'; then $(CYGPATH_W) '../lib/countries.C'; else $(CYGPATH_W) '$(srcdir)/../lib/countries.C'`
-
 md5_file.o: ../lib/md5_file.C
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5_file.o -MD -MP -MF "$(DEPDIR)/md5_file.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o md5_file.o `test -f '../lib/md5_file.C' || echo '$(srcdir)/'`../lib/md5_file.C; \
diff --git a/tools/country_select.C b/tools/country_select.C
deleted file mode 100644
index 08cbdf231d..0000000000
--- a/tools/country_select.C
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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 <stdio.h>
-#include <string.h>
-
-
-#include "countries.h"
-
-int main(int argc, char** argv) {
-    int i;
-    for (i=0; i<NUM_COUNTRIES; i++) {
-        printf(
-            "<option value=\"%s\" %s>%s\n",
-            countries[i],
-            !strcmp(countries[i], argv[1])?"selected":"",
-            countries[i]
-        );
-    }
-}