From dfa1dbbab30733ed47752bea2a6bad1b52183db4 Mon Sep 17 00:00:00 2001
From: Karl Chen <quarl@quarl.org>
Date: Tue, 15 Jul 2003 21:12:26 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=1682
---
 client/Makefile.in | 10 +++++-----
 lib/Makefile.in    |  8 ++++----
 sched/Makefile.in  | 17 +++++++----------
 test/Makefile.in   | 13 +++++--------
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/client/Makefile.in b/client/Makefile.in
index be06eaddde..a5d7b4e962 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -137,12 +137,12 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
-MYSQL_INCLUDES = /usr/local/mysql_32bit/include
-MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql
-MYSQL_INCLUDES3 = /usr/include/mysql_32bit
+MYSQL_INCLUDES = /usr/local/mysql/include
+MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql
+MYSQL_INCLUDES3 = /usr/include/mysql
 
 MYSQL_LIBS = \
-        -L/usr/local/mysql_32bit/lib -L/sw/lib/mysql -L/usr/local/lib/mysql	\
+        -L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql	\
         -lmysqlclient -L/usr/local/lib -lz				\
         -lm $(NETLIBS)
 
@@ -1385,7 +1385,7 @@ win/win_config.h: $(top_srcdir)/config.h
 
 # make a hard link to the client name.
 @CLIENT_BIN_FILENAME@: boinc_client
-	rm -f $^
+	rm -f $@
 	ln $^ $@
 
 @CLIENT_BIN_FILENAME@.gz: @CLIENT_BIN_FILENAME@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index aa376c5d64..36973a187c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -135,12 +135,12 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
-MYSQL_INCLUDES = /usr/local/mysql_32bit/include
-MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql
-MYSQL_INCLUDES3 = /usr/include/mysql_32bit
+MYSQL_INCLUDES = /usr/local/mysql/include
+MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql
+MYSQL_INCLUDES3 = /usr/include/mysql
 
 MYSQL_LIBS = \
-        -L/usr/local/mysql_32bit/lib -L/sw/lib/mysql -L/usr/local/lib/mysql	\
+        -L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql	\
         -lmysqlclient -L/usr/local/lib -lz				\
         -lm $(NETLIBS)
 
diff --git a/sched/Makefile.in b/sched/Makefile.in
index f83d7091f3..a3f2c350ea 100644
--- a/sched/Makefile.in
+++ b/sched/Makefile.in
@@ -135,9 +135,9 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
-MYSQL_INCLUDES = /usr/local/mysql_32bit/include
-MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql
-MYSQL_INCLUDES3 = /usr/include/mysql_32bit
+MYSQL_INCLUDES = /usr/local/mysql/include
+MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql
+MYSQL_INCLUDES3 = /usr/include/mysql
 
 MYSQL_LIBS = \
         -L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql	\
@@ -179,7 +179,7 @@ noinst_PROGRAMS = \
 noinst_LIBRARIES = libsched.a
 
 EXTRA_PROGRAMS = fcgi
-EXTRA_DIST = wd.php wd_nresults_changing.php
+EXTRA_DIST = wd.php wd_nresults_changing.php watch_tcp start
 
 # scripts that 'make install' should put in bindir
 bin_SCRIPTS = watch_tcp start stop status
@@ -248,9 +248,9 @@ file_upload_handler_LDADD = $(LDADD) $(RSA_LIBS)
 make_work_SOURCES = \
         make_work.C				\
         ../tools/backend_lib.C			\
-        ../tools/process_result_template.C	\
-make_work_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
+        ../tools/process_result_template.C
 
+make_work_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
 make_work_LDADD = $(LDADD) $(RSA_LIBS)
 
 timeout_check_SOURCES = \
@@ -322,12 +322,9 @@ file_deleter_LDFLAGS =
 am_file_upload_handler_OBJECTS = file_upload_handler.$(OBJEXT)
 file_upload_handler_OBJECTS = $(am_file_upload_handler_OBJECTS)
 file_upload_handler_LDFLAGS =
-am__objects_1 =
 am_make_work_OBJECTS = make_work.$(OBJEXT) backend_lib.$(OBJEXT) \
-	process_result_template.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_1)
+	process_result_template.$(OBJEXT)
 make_work_OBJECTS = $(am_make_work_OBJECTS)
-make_work_DEPENDENCIES =
 make_work_LDFLAGS =
 am_show_shmem_OBJECTS = show_shmem.$(OBJEXT)
 show_shmem_OBJECTS = $(am_show_shmem_OBJECTS)
diff --git a/test/Makefile.in b/test/Makefile.in
index 93e647df2b..67bb8cd14d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -182,14 +182,13 @@ TESTS = test_sanity.py				\
 	test_masterurl_failure.py
 
 
-EXTRA_DIST = \
-        *.xml *.php *wu *result *output *input
-
 
 # TODO: phase out php stuff
-noinst_SCRIPTS = \
+EXTRA_DIST = \
+        *.xml *wu *result *output *input			\
 	db_def_to_php db_def_to_py				\
-	*.php version.inc.in boinc.py test_*.py version.py.in
+	*.php version.inc.in boinc.py test_*.py version.py.in	\
+	boinc_db.inc boinc_db.py
 
 
 BUILT_SOURCES = boinc_db.inc boinc_db.py
@@ -198,8 +197,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.inc version.py
-SCRIPTS = $(noinst_SCRIPTS)
-
 DIST_SOURCES =
 DIST_COMMON = README $(top_srcdir)/Makefile.incl Makefile.am \
 	Makefile.in version.inc.in version.py.in
@@ -333,7 +330,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile
 
 installdirs:
 install: $(BUILT_SOURCES)