From 4e294d1e5a42db5b0516f7e9f56cc4e6e52e9962 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 8 Jan 2005 07:44:22 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=5030 --- Makefile.incl | 20 ++++++++++++------ checkin_notes | 14 +++++++++++++ sched/Makefile.am | 16 +++++--------- sched/wu_check.C | 5 ++++- tools/Makefile.am | 49 +++++++++++++------------------------------ tools/backend_lib.C | 1 + tools/dir_hier_move.C | 1 + tools/dir_hier_path.C | 1 + 8 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Makefile.incl b/Makefile.incl index 644d16f002..466cde3715 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -8,9 +8,9 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ -RSA_LIBS = \ - -L$(top_builddir)/RSAEuro/source \ - -lrsaeuro +RSA_LIBS = -L$(top_builddir)/RSAEuro/source -lrsaeuro +SCHED_LIB = -L$(top_builddir)/sched -lsched +BOINC_LIB = -L$(top_builddir)/lib -lboinc AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ @@ -24,9 +24,17 @@ AM_CPPFLAGS = \ $(PTHREAD_CFLAGS) \ -include $(top_builddir)/config.h -# this is useful as a dependency to make sure librsaeuro gets compiled before -# programs linking to it: -LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a +# dependencies to make sure libs gets compiled before +# programs linking to them: +LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a $(LIBRSA): cd $(top_builddir)/RSAEuro/source; ${MAKE} librsaeuro.a + +LIBSCHED = $(top_builddir)/libsched.a +$(LIBSCHED): + cd $(top_builddir)/sched; ${MAKE} libsched.a + +LIBBOINC = $(top_builddir)/libboinc.a +$(LIBBOINC): + cd $(top_builddir)/lib; ${MAKE} libboinc.a diff --git a/checkin_notes b/checkin_notes index f42571bd3f..dda4ae7ed3 100755 --- a/checkin_notes +++ b/checkin_notes @@ -22291,3 +22291,17 @@ David 7 Jan 2005 sched/ file_deleter.C sched_util.C,h + +David 7 Jan 2005 + - Changed Makefile.am's to use libraries (libboinc.a, libsched.a) + instead of listing separate .o files + + Makefile.incl + sched/ + Makefile.am + wu_check.C + tools/ + Makefile.am + backend_lib.C + dir_hier_move.C + dir_hier_path.C diff --git a/sched/Makefile.am b/sched/Makefile.am index 210d9b5e2b..989699845d 100644 --- a/sched/Makefile.am +++ b/sched/Makefile.am @@ -28,12 +28,11 @@ noinst_PROGRAMS = \ lib_LIBRARIES = libsched.a EXTRA_PROGRAMS = fcgi -EXTRA_DIST = start # scripts that 'make install' should put in bindir bin_SCRIPTS = start stop status -LDADD = -L. -lsched $(MYSQL_LIBS) $(PTHREAD_LIBS) +LDADD = -L. -lsched $(MYSQL_LIBS) $(BOINC_LIB) $(PTHREAD_LIBS) LIB_SCHED = libsched.a @@ -44,17 +43,11 @@ libsched_a_SOURCES = \ sched_msgs.C \ ../db/boinc_db.C \ ../db/db_base.C \ - ../lib/util.C \ - ../lib/crypt.C \ - ../lib/filesys.C \ - ../lib/parse.C \ - ../lib/base64.C \ - ../lib/shmem.C \ - ../lib/md5.c \ - ../lib/md5_file.C \ ../lib/msg_log.C \ ../tools/process_result_template.C \ - ../tools/backend_lib.C \ + ../tools/backend_lib.C + +EXTRA_DIST = \ assimilate_handler.h \ fcgiapp.h \ fcgi_stdio.h \ @@ -67,6 +60,7 @@ libsched_a_SOURCES = \ sched_shmem.h \ sched_util.h \ server_types.h \ + start \ validate_util.h diff --git a/sched/wu_check.C b/sched/wu_check.C index 4e004253bf..16b43bf976 100644 --- a/sched/wu_check.C +++ b/sched/wu_check.C @@ -23,11 +23,14 @@ #include +#include "boinc_db.h" + #include "parse.h" #include "util.h" #include "error_numbers.h" -#include "boinc_db.h" + #include "sched_config.h" +#include "sched_util.h" bool repair = false; diff --git a/tools/Makefile.am b/tools/Makefile.am index 4ea5380110..e9ba8215db 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,46 +9,25 @@ EXTRA_DIST = make_project add xadd update_versions dbcheck_files_exist upgrade # TODO: use libboinc for these: create_work_SOURCES = \ - create_work.C \ - backend_lib.C \ - process_result_template.C \ - ../lib/filesys.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 + create_work.C -create_work_DEPENDENCIES = $(LIBRSA) -create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) $(PTHREAD_LIBS) +create_work_DEPENDENCIES = $(LIBRSA) $(LIBBOINC) $(LIBSCHED) +create_work_LDADD = $(SCHED_LIB) $(BOINC_LIB) $(RSA_LIBS) $(MYSQL_LIBS) sign_executable_SOURCES = \ - sign_executable.C \ - ../lib/md5_file.C \ - ../lib/md5.c \ - ../lib/crypt.C + sign_executable.C -sign_executable_DEPENDENCIES = $(LIBRSA) -sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) $(PTHREAD_LIBS) +sign_executable_DEPENDENCIES = $(LIBRSA) $(LIBBOINC) +sign_executable_LDADD = $(BOINC_LIB) $(RSA_LIBS) $(MYSQL_LIBS) dir_hier_path_SOURCES = \ - dir_hier_path.C \ - ../sched/sched_config.C \ - ../lib/filesys.C \ - ../lib/parse.C \ - ../lib/util.C \ - ../lib/md5_file.C \ - ../lib/md5.c + dir_hier_path.C + +dir_hier_path_DEPENDENCIES = $(LIBBOINC) $(LIBSCHED) +dir_hier_path_LDADD = $(SCHED_LIB) $(BOINC_LIB) dir_hier_move_SOURCES = \ - dir_hier_move.C \ - ../sched/sched_config.C \ - ../lib/parse.C \ - ../lib/filesys.C \ - ../lib/util.C \ - ../lib/md5_file.C \ - ../lib/md5.c + dir_hier_move.C + +dir_hier_move_DEPENDENCIES = $(LIBBOINC) $(LIBSCHED) +dir_hier_move_LDADD = $(SCHED_LIB) $(BOINC_LIB) diff --git a/tools/backend_lib.C b/tools/backend_lib.C index fd45425e64..ec9aaec2a3 100644 --- a/tools/backend_lib.C +++ b/tools/backend_lib.C @@ -33,6 +33,7 @@ #include "parse.h" #include "util.h" #include "filesys.h" +#include "sched_util.h" #include "backend_lib.h" diff --git a/tools/dir_hier_move.C b/tools/dir_hier_move.C index c4c9e78035..8e2e5c266c 100644 --- a/tools/dir_hier_move.C +++ b/tools/dir_hier_move.C @@ -10,6 +10,7 @@ #include "filesys.h" #include "util.h" +#include "sched_util.h" int main(int argc, char** argv) { char* src_dir, *dst_dir; diff --git a/tools/dir_hier_path.C b/tools/dir_hier_path.C index 1df5e0c8bf..63c1fcf527 100644 --- a/tools/dir_hier_path.C +++ b/tools/dir_hier_path.C @@ -2,6 +2,7 @@ #include "util.h" #include "sched_config.h" +#include "sched_util.h" int main(int argc, char** argv) { SCHED_CONFIG config;