From: Gábor Gombás <[email protected]>
Complements the previous patch for libraries: link programs only against
the libraries they use directly.
---
Makefile.incl | 2 --
sched/Makefile.am | 31 ++++---------------------------
tools/Makefile.am | 6 ++----
3 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/Makefile.incl b/Makefile.incl
index f1baf00..52ee835 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -54,7 +54,5 @@ LIBAPI = $(top_builddir)/api/libboinc_api.la
$(LIBAPI):
cd $(top_builddir)/api; ${MAKE} libboinc_api.la
-SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS)
$(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
-SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi
$(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
APPLIBS = $(LIBAPI) $(LIBBOINC)
diff --git a/sched/Makefile.am b/sched/Makefile.am
index 5221b63..328ec58 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -6,6 +6,8 @@ include $(top_srcdir)/Makefile.incl
AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
AM_LDFLAGS += -static
+LDADD = libsched.la
+
if ENABLE_LIBRARIES
libsched_sources = \
@@ -155,29 +157,23 @@ cgi_sources = \
time_stats_log.cpp
cgi_SOURCES = $(cgi_sources)
-cgi_LDADD = $(SERVERLIBS)
census_SOURCES = \
census.cpp \
hr.cpp \
hr_info.cpp
-census_LDADD = $(SERVERLIBS)
feeder_SOURCES = \
feeder.cpp \
hr.cpp \
hr_info.cpp \
../lib/synch.cpp
-feeder_LDADD = $(SERVERLIBS)
wu_check_SOURCES = wu_check.cpp
-wu_check_LDADD = $(SERVERLIBS)
show_shmem_SOURCES = show_shmem.cpp
-show_shmem_LDADD = $(SERVERLIBS)
file_deleter_SOURCES = file_deleter.cpp
-file_deleter_LDADD = $(SERVERLIBS)
VALIDATOR_SOURCES = \
credit.cpp \
@@ -187,11 +183,9 @@ VALIDATOR_SOURCES = \
sample_bitwise_validator_SOURCES = $(VALIDATOR_SOURCES) \
sample_bitwise_validator.cpp
-sample_bitwise_validator_LDADD = $(SERVERLIBS)
sample_trivial_validator_SOURCES = $(VALIDATOR_SOURCES) \
sample_trivial_validator.cpp
-sample_trivial_validator_LDADD = $(SERVERLIBS)
ASSIMILATOR_SOURCES = \
assimilator.cpp \
@@ -199,57 +193,40 @@ ASSIMILATOR_SOURCES = \
sample_dummy_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
sample_dummy_assimilator.cpp
-sample_dummy_assimilator_LDADD = $(SERVERLIBS)
sample_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
sample_assimilator.cpp
-sample_assimilator_LDADD = $(SERVERLIBS)
single_job_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
single_job_assimilator.cpp
-single_job_assimilator_LDADD = $(SERVERLIBS)
sample_work_generator_SOURCES = sample_work_generator.cpp
-sample_work_generator_LDADD = $(SERVERLIBS)
db_dump_SOURCES = db_dump.cpp
-db_dump_LDADD = $(SERVERLIBS)
db_purge_SOURCES = db_purge.cpp
-db_purge_LDADD = $(SERVERLIBS)
trickle_handler_SOURCES = trickle_handler.cpp
-trickle_handler_LDADD = $(SERVERLIBS)
update_stats_SOURCES = update_stats.cpp
-update_stats_LDADD = $(SERVERLIBS)
file_upload_handler_SOURCES = file_upload_handler.cpp
-file_upload_handler_LDADD = $(SERVERLIBS)
make_work_SOURCES = make_work.cpp
-make_work_LDADD = $(SERVERLIBS)
transitioner_SOURCES = transitioner.cpp
-transitioner_LDADD = $(SERVERLIBS)
message_handler_SOURCES = message_handler.cpp
-message_handler_LDADD = $(SERVERLIBS)
request_file_list_SOURCES = request_file_list.cpp
-request_file_list_LDADD = $(SERVERLIBS)
get_file_SOURCES = get_file.cpp
-get_file_LDADD = $(SERVERLIBS)
send_file_SOURCES = send_file.cpp
-send_file_LDADD = $(SERVERLIBS)
delete_file_SOURCES = delete_file.cpp
-delete_file_LDADD = $(SERVERLIBS)
sched_driver_SOURCES = sched_driver.cpp
-sched_driver_LDADD = $(SERVERLIBS)
if ENABLE_FCGI
@@ -258,7 +235,7 @@ cgi_PROGRAMS += fcgi \
fcgi_SOURCES = $(cgi_sources)
fcgi_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
-fcgi_LDADD = $(SERVERLIBS_FCGI)
+fcgi_LDADD = libsched_fcgi.la
fcgi_file_upload_handler_SOURCES = \
@@ -266,7 +243,7 @@ fcgi_file_upload_handler_SOURCES = \
sched_config.cpp \
sched_msgs.cpp
fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
-fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI)
+fcgi_file_upload_handler_LDADD = libsched_fcgi.la
endif
# end of "if ENABLE_FCGI"
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d0973e1..cc551fb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,14 +24,12 @@ dist_sched_SCRIPTS = \
AM_CXXFLAGS += $(MYSQL_CFLAGS)
AM_LDFLAGS += -static
+LDADD = ../sched/libsched.la
+
create_work_SOURCES = create_work.cpp
-create_work_LDADD = $(SERVERLIBS)
sign_executable_SOURCES = sign_executable.cpp
-sign_executable_LDADD = $(SERVERLIBS)
dir_hier_path_SOURCES = dir_hier_path.cpp
-dir_hier_path_LDADD = $(SERVERLIBS)
dir_hier_move_SOURCES = dir_hier_move.cpp
-dir_hier_move_LDADD = $(SERVERLIBS)
--
1.6.4.3
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
