From: Gábor Gombás <[email protected]>
Get rid of the library name macros and the cross-direcory make rules. If
there are problems with the dependencies, they should be fixed instead
of papering over them. Also move some flags to the global level instead
of listing them for every program.
---
Makefile.incl | 28 ----------------------------
api/Makefile.am | 4 ++--
apps/Makefile.am | 13 ++++---------
client/Makefile.am | 6 ++----
clientgui/Makefile.am | 2 +-
lib/Makefile.am | 8 ++++----
6 files changed, 13 insertions(+), 48 deletions(-)
diff --git a/Makefile.incl b/Makefile.incl
index 52ee835..8dbfed9 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -11,8 +11,6 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
-RSA_LIBS = -lcrypto
-
AM_LIBTOOLFLAGS =
AM_CPPFLAGS = \
@@ -30,29 +28,3 @@ AM_CFLAGS =
AM_CXXFLAGS =
AM_LDFLAGS =
-
-
-# dependencies to make sure libs gets compiled before
-# programs linking to them:
-
-LIBSCHED = $(top_builddir)/sched/libsched.la
-$(LIBSCHED):
- cd $(top_builddir)/sched; ${MAKE} libsched.la
-LIBSCHED_FCGI = $(top_builddir)/sched/libsched_fcgi.la
-$(LIBSCHED_FCGI):
- cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
-LIBBOINC = $(top_builddir)/lib/libboinc.la
-$(LIBBOINC):
- cd $(top_builddir)/lib; ${MAKE} libboinc.la
-LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
-$(LIBBOINC_CRYPT):
- cd $(top_builddir)/lib; ${MAKE} libboinc.la
-LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
-$(LIBBOINC_FCGI):
- cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
-LIBAPI = $(top_builddir)/api/libboinc_api.la
-$(LIBAPI):
- cd $(top_builddir)/api; ${MAKE} libboinc_api.la
-
-APPLIBS = $(LIBAPI) $(LIBBOINC)
-
diff --git a/api/Makefile.am b/api/Makefile.am
index 974b8ff..49a0db4 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -89,7 +89,7 @@ endif ## ENABLE_LIBRARIES
EXTRA_PROGRAMS = api_app api_test
api_app_SOURCES = api_app.cpp ../lib/parse.cpp
-api_app_LDADD = $(LIBAPI)
+api_app_LDADD = libbonc_api.la
api_test_SOURCES = api_test.cpp ../lib/parse.cpp
-api_test_LDADD = $(LIBAPI)
+api_test_LDADD = libboinc_api.la
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 858f403..59ec60c 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -6,17 +6,12 @@ include $(top_srcdir)/Makefile.incl
exampledir = $(libexecdir)/examples
example_PROGRAMS = upper_case concat 1sec
+AM_CXXFLAGS += $(PTHREAD_CFLAGS)
+AM_LDFLAGS += -static-libtool-libs $(PTHREAD_CFLAGS)
+LDADD = ../api/libboinc_api.la ../lib/libboinc.la
+
upper_case_SOURCES = upper_case.cpp
-upper_case_CXXFLAGS = $(PTHREAD_CFLAGS)
-upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
-upper_case_LDADD = $(APPLIBS)
concat_SOURCES = concat.cpp
-concat_CXXFLAGS = $(PTHREAD_CFLAGS)
-concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
-concat_LDADD = $(APPLIBS)
1sec_SOURCES = 1sec.cpp
-1sec_CXXFLAGS = $(PTHREAD_CFLAGS)
-1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
-1sec_LDADD = $(APPLIBS)
diff --git a/client/Makefile.am b/client/Makefile.am
index 6122ff4..0d262c0 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -25,10 +25,9 @@ endif
bin_PROGRAMS = boinc_client switcher boinccmd
boinccmd_SOURCES = boinc_cmd.cpp
-boinccmd_DEPENDENCIES = $(LIBBOINC)
boinccmd_CPPFLAGS = $(AM_CPPFLAGS)
boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib
-boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+boinccmd_LDADD = ../lib/libboinc.la $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
boinc_client_SOURCES = \
acct_mgr.cpp \
@@ -74,10 +73,9 @@ boinc_client_SOURCES = \
whetstone.cpp \
work_fetch.cpp
-boinc_client_DEPENDENCIES = $(LIBBOINC)
boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
boinc_client_LDFLAGS = $(AM_LDFLAGS) -L../lib
-boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS)
$(PTHREAD_LIBS)
+boinc_client_LDADD = ../lib/libboinc_crypt.la ../lib/libboinc.la
$(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
boinc_clientdir = $(bindir)
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
index 2355728..9537fb9 100644
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -116,7 +116,7 @@ EXTRA_DIST = *.h \
boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(CLIENTGUIFLAGS)
boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(CLIENTGUIFLAGS)
-boincmgr_LDADD = $(LIBBOINC) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS)
+boincmgr_LDADD = ../lib/libboinc.la $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS)
$(CLIENTLIBS)
win_config.h: $(top_srcdir)/config.h
grep '#define.*BOINC.*VERSION' $^ > $@
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a3ea8a2..293157c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -202,14 +202,14 @@ EXTRA_DIST = *.h *.cpp
md5_test_SOURCES = md5_test.cpp
md5_test_CXXFLAGS = $(PTHREAD_CFLAGS)
-md5_test_LDADD = $(LIBBOINC)
+md5_test_LDADD = libboinc.la
shmem_test_SOURCES = shmem_test.cpp
shmem_test_CXXFLAGS = $(PTHREAD_CFLAGS)
-shmem_test_LDADD = $(LIBBOINC)
+shmem_test_LDADD = libboinc.la
msg_test_SOURCES = msg_test.cpp
msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
-msg_test_LDADD = $(LIBBOINC)
+msg_test_LDADD = libboinc.la
crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
-crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT_STATIC) $(SSL_LIBS)
+crypt_prog_LDADD = libboinc.la libboinc_crypt.la $(SSL_LIBS)
--
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.
