Browse Source

Optimize build by using a single makefile file. (#941)

pull/948/head
Jari Sundell 3 years ago committed by GitHub
parent
commit
8cc1d8f2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      configure.ac
  2. 183
      src/Makefile.am
  3. 33
      src/core/Makefile.am
  4. 53
      src/display/Makefile.am
  5. 15
      src/input/Makefile.am
  6. 32
      src/rpc/Makefile.am
  7. 33
      src/ui/Makefile.am
  8. 14
      src/utils/Makefile.am
  9. 10
      test/Makefile.am

8
configure.ac

@ -2,7 +2,7 @@ AC_INIT(rtorrent, 0.9.8, sundell.software@gmail.com)
AC_DEFINE(API_VERSION, 10, api version)
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([subdir-objects])
AC_CONFIG_HEADERS(config.h)
AC_PROG_RANLIB
@ -66,11 +66,5 @@ AC_OUTPUT([
Makefile
doc/Makefile
src/Makefile
src/core/Makefile
src/display/Makefile
src/input/Makefile
src/rpc/Makefile
src/ui/Makefile
src/utils/Makefile
test/Makefile
])

183
src/Makefile.am

@ -1,14 +1,166 @@
SUBDIRS = \
core \
display \
input \
rpc \
ui \
utils
noinst_LIBRARIES = libsub_root.a
bin_PROGRAMS = rtorrent
rtorrent_LDADD = libsub_root.a @PTHREAD_LIBS@
rtorrent_SOURCES = main.cc
libsub_root_a_SOURCES = \
core/curl_get.cc \
core/curl_get.h \
core/curl_socket.cc \
core/curl_socket.h \
core/curl_stack.cc \
core/curl_stack.h \
core/dht_manager.cc \
core/dht_manager.h \
core/download.cc \
core/download.h \
core/download_factory.cc \
core/download_factory.h \
core/download_list.cc \
core/download_list.h \
core/download_slot_map.h \
core/download_store.cc \
core/download_store.h \
core/http_queue.cc \
core/http_queue.h \
core/manager.cc \
core/manager.h \
core/poll_manager.cc \
core/poll_manager.h \
core/range_map.h \
core/view.cc \
core/view.h \
core/view_manager.cc \
core/view_manager.h \
\
display/attributes.h \
display/canvas.cc \
display/canvas.h \
display/frame.cc \
display/frame.h \
display/manager.cc \
display/manager.h \
display/utils.cc \
display/utils.h \
display/text_element.h \
display/text_element_list.cc \
display/text_element_list.h \
display/text_element_string.cc \
display/text_element_string.h \
display/text_element_value.cc \
display/text_element_value.h \
display/window.cc \
display/window.h \
display/window_download_chunks_seen.cc \
display/window_download_chunks_seen.h \
display/window_download_list.cc \
display/window_download_list.h \
display/window_download_statusbar.cc \
display/window_download_statusbar.h \
display/window_download_transfer_list.cc \
display/window_download_transfer_list.h \
display/window_file_list.cc \
display/window_file_list.h \
display/window_http_queue.cc \
display/window_http_queue.h \
display/window_input.cc \
display/window_input.h \
display/window_log.cc \
display/window_log.h \
display/window_log_complete.cc \
display/window_log_complete.h \
display/window_peer_list.cc \
display/window_peer_list.h \
display/window_statusbar.cc \
display/window_statusbar.h \
display/window_string_list.cc \
display/window_string_list.h \
display/window_text.cc \
display/window_text.h \
display/window_title.cc \
display/window_title.h \
display/window_tracker_list.cc \
display/window_tracker_list.h \
\
input/bindings.cc \
input/bindings.h \
input/input_event.cc \
input/input_event.h \
input/manager.cc \
input/manager.h \
input/path_input.cc \
input/path_input.h \
input/text_input.cc \
input/text_input.h \
\
rpc/command.h \
rpc/command.cc \
rpc/command_impl.h \
rpc/command_map.cc \
rpc/command_map.h \
rpc/command_scheduler.cc \
rpc/command_scheduler.h \
rpc/command_scheduler_item.cc \
rpc/command_scheduler_item.h \
rpc/exec_file.cc \
rpc/exec_file.h \
rpc/fixed_key.h \
rpc/ip_table_list.h \
rpc/object_storage.cc \
rpc/object_storage.h \
rpc/parse.cc \
rpc/parse.h \
rpc/parse_commands.cc \
rpc/parse_commands.h \
rpc/parse_options.cc \
rpc/parse_options.h \
rpc/scgi.cc \
rpc/scgi.h \
rpc/scgi_task.cc \
rpc/scgi_task.h \
rpc/xmlrpc.h \
rpc/xmlrpc.cc \
\
ui/download.cc \
ui/download.h \
ui/download_list.cc \
ui/download_list.h \
ui/element_base.h \
ui/element_base.cc \
ui/element_chunks_seen.cc \
ui/element_chunks_seen.h \
ui/element_download_list.cc \
ui/element_download_list.h \
ui/element_file_list.cc \
ui/element_file_list.h \
ui/element_log_complete.cc \
ui/element_log_complete.h \
ui/element_menu.cc \
ui/element_menu.h \
ui/element_peer_list.cc \
ui/element_peer_list.h \
ui/element_string_list.cc \
ui/element_string_list.h \
ui/element_text.cc \
ui/element_text.h \
ui/element_tracker_list.cc \
ui/element_tracker_list.h \
ui/element_transfer_list.cc \
ui/element_transfer_list.h \
ui/root.cc \
ui/root.h \
\
utils/directory.cc \
utils/directory.h \
utils/file_status_cache.cc \
utils/file_status_cache.h \
utils/list_focus.h \
utils/lockfile.cc \
utils/lockfile.h \
utils/socket_fd.cc \
utils/socket_fd.h \
\
command_download.cc \
command_dynamic.cc \
command_events.cc \
@ -38,19 +190,4 @@ libsub_root_a_SOURCES = \
thread_worker.cc \
thread_worker.h
bin_PROGRAMS = rtorrent
rtorrent_LDADD = \
libsub_root.a \
ui/libsub_ui.a \
core/libsub_core.a \
display/libsub_display.a \
input/libsub_input.a \
rpc/libsub_rpc.a \
utils/libsub_utils.a \
@PTHREAD_LIBS@
rtorrent_SOURCES = \
main.cc
AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)

33
src/core/Makefile.am

@ -1,33 +0,0 @@
noinst_LIBRARIES = libsub_core.a
libsub_core_a_SOURCES = \
curl_get.cc \
curl_get.h \
curl_socket.cc \
curl_socket.h \
curl_stack.cc \
curl_stack.h \
dht_manager.cc \
dht_manager.h \
download.cc \
download.h \
download_factory.cc \
download_factory.h \
download_list.cc \
download_list.h \
download_slot_map.h \
download_store.cc \
download_store.h \
http_queue.cc \
http_queue.h \
manager.cc \
manager.h \
poll_manager.cc \
poll_manager.h \
range_map.h \
view.cc \
view.h \
view_manager.cc \
view_manager.h
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

53
src/display/Makefile.am

@ -1,53 +0,0 @@
noinst_LIBRARIES = libsub_display.a
libsub_display_a_SOURCES = \
attributes.h \
canvas.cc \
canvas.h \
frame.cc \
frame.h \
manager.cc \
manager.h \
utils.cc \
utils.h \
text_element.h \
text_element_list.cc \
text_element_list.h \
text_element_string.cc \
text_element_string.h \
text_element_value.cc \
text_element_value.h \
window.cc \
window.h \
window_download_chunks_seen.cc \
window_download_chunks_seen.h \
window_download_list.cc \
window_download_list.h \
window_download_statusbar.cc \
window_download_statusbar.h \
window_download_transfer_list.cc \
window_download_transfer_list.h \
window_file_list.cc \
window_file_list.h \
window_http_queue.cc \
window_http_queue.h \
window_input.cc \
window_input.h \
window_log.cc \
window_log.h \
window_log_complete.cc \
window_log_complete.h \
window_peer_list.cc \
window_peer_list.h \
window_statusbar.cc \
window_statusbar.h \
window_string_list.cc \
window_string_list.h \
window_text.cc \
window_text.h \
window_title.cc \
window_title.h \
window_tracker_list.cc \
window_tracker_list.h
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

15
src/input/Makefile.am

@ -1,15 +0,0 @@
noinst_LIBRARIES = libsub_input.a
libsub_input_a_SOURCES = \
bindings.cc \
bindings.h \
input_event.cc \
input_event.h \
manager.cc \
manager.h \
path_input.cc \
path_input.h \
text_input.cc \
text_input.h
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

32
src/rpc/Makefile.am

@ -1,32 +0,0 @@
noinst_LIBRARIES = libsub_rpc.a
libsub_rpc_a_SOURCES = \
command.h \
command.cc \
command_impl.h \
command_map.cc \
command_map.h \
command_scheduler.cc \
command_scheduler.h \
command_scheduler_item.cc \
command_scheduler_item.h \
exec_file.cc \
exec_file.h \
fixed_key.h \
ip_table_list.h \
object_storage.cc \
object_storage.h \
parse.cc \
parse.h \
parse_commands.cc \
parse_commands.h \
parse_options.cc \
parse_options.h \
scgi.cc \
scgi.h \
scgi_task.cc \
scgi_task.h \
xmlrpc.h \
xmlrpc.cc
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

33
src/ui/Makefile.am

@ -1,33 +0,0 @@
noinst_LIBRARIES = libsub_ui.a
libsub_ui_a_SOURCES = \
download.cc \
download.h \
download_list.cc \
download_list.h \
element_base.h \
element_base.cc \
element_chunks_seen.cc \
element_chunks_seen.h \
element_download_list.cc \
element_download_list.h \
element_file_list.cc \
element_file_list.h \
element_log_complete.cc \
element_log_complete.h \
element_menu.cc \
element_menu.h \
element_peer_list.cc \
element_peer_list.h \
element_string_list.cc \
element_string_list.h \
element_text.cc \
element_text.h \
element_tracker_list.cc \
element_tracker_list.h \
element_transfer_list.cc \
element_transfer_list.h \
root.cc \
root.h
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

14
src/utils/Makefile.am

@ -1,14 +0,0 @@
noinst_LIBRARIES = libsub_utils.a
libsub_utils_a_SOURCES = \
directory.cc \
directory.h \
file_status_cache.cc \
file_status_cache.h \
list_focus.h \
lockfile.cc \
lockfile.h \
socket_fd.cc \
socket_fd.h
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

10
test/Makefile.am

@ -1,15 +1,7 @@
TESTS = rtorrentTest
AUTOMAKE_OPTIONS = subdir-objects
check_PROGRAMS = $(TESTS)
rtorrentTest_LDADD = \
../src/libsub_root.a \
../src/ui/libsub_ui.a \
../src/core/libsub_core.a \
../src/display/libsub_display.a \
../src/input/libsub_input.a \
../src/rpc/libsub_rpc.a \
../src/utils/libsub_utils.a
rtorrentTest_LDADD = ../src/libsub_root.a
rtorrentTest_SOURCES = \
rpc/command_test.cc \

Loading…
Cancel
Save