From a125f9c7f359896a1aa184937fc601b6069d45fd Mon Sep 17 00:00:00 2001 From: Felix Delattre Date: Sun, 14 Feb 2021 13:48:32 +0000 Subject: [PATCH] Formatted Makefile --- Makefile.am | 115 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8525809..9047d31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,43 +4,130 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(PTHREAD_CFLAGS) -STORE_SOURCES = src/store.c src/store_file.c src/store_file_utils.c src/store_memcached.c src/store_rados.c src/store_ro_http_proxy.c src/store_ro_composite.c src/store_null.c +STORE_SOURCES = \ + src/store.c \ + src/store_file.c \ + src/store_file_utils.c \ + src/store_memcached.c \ + src/store_rados.c \ + src/store_ro_http_proxy.c \ + src/store_ro_composite.c \ + src/store_null.c STORE_LDFLAGS = $(LIBMEMCACHED_LDFLAGS) $(LIBRADOS_LDFLAGS) $(LIBCURL) + STORE_CPPFLAGS = -bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old +bin_PROGRAMS = \ + renderd \ + render_expired \ + render_list \ + render_speedtest \ + render_old noinst_PROGRAMS = gen_tile_test -man_MANS = docs/renderd.1 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1 + +man_MANS = \ + docs/renderd.1 \ + docs/render_expired.1 \ + docs/render_list.1 \ + docs/render_old.1 \ + docs/render_speedtest.1 renderddir = $(sysconfdir) -renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES) + +renderd_SOURCES = \ + src/daemon.c \ + src/daemon_compat.c \ + src/gen_tile.cpp \ + src/sys_utils.c \ + src/request_queue.c \ + src/cache_expire.c \ + src/metatile.cpp \ + src/parameterize_style.cpp \ + src/protocol_helper.c \ + $(STORE_SOURCES) renderd_CXXFLAGS = $(MAPNIK_CFLAGS) renderd_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) -liniparser renderd_DATA = renderd.conf -render_speedtest_SOURCES = src/speedtest.cpp src/protocol_helper.c src/render_submit_queue.c src/sys_utils.c + +render_speedtest_SOURCES = \ + src/speedtest.cpp \ + src/protocol_helper.c \ + src/render_submit_queue.c \ + src/sys_utils.c render_speedtest_LDADD = $(PTHREAD_CFLAGS) -render_list_SOURCES = src/render_list.c src/sys_utils.c src/protocol_helper.c src/render_submit_queue.c $(STORE_SOURCES) + +render_list_SOURCES = \ + src/render_list.c \ + src/sys_utils.c \ + src/protocol_helper.c \ + src/render_submit_queue.c $(STORE_SOURCES) render_list_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS) -render_expired_SOURCES = src/render_expired.c src/protocol_helper.c src/render_submit_queue.c src/sys_utils.c $(STORE_SOURCES) + +render_expired_SOURCES = \ + src/render_expired.c \ + src/protocol_helper.c \ + src/render_submit_queue.c \ + src/sys_utils.c \ + $(STORE_SOURCES) render_expired_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS) -render_old_SOURCES = src/store_file_utils.c src/render_old.c src/sys_utils.c src/protocol_helper.c src/render_submit_queue.c + +render_old_SOURCES = \ + src/store_file_utils.c \ + src/render_old.c \ + src/sys_utils.c \ + src/protocol_helper.c \ + src/render_submit_queue.c render_old_LDADD = $(PTHREAD_CFLAGS) + #convert_meta_SOURCES = src/dir_utils.c src/store.c src/convert_meta.c -gen_tile_test_SOURCES = src/gen_tile_test.cpp src/metatile.cpp src/request_queue.c src/protocol_helper.c src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/cache_expire.c src/parameterize_style.cpp $(STORE_SOURCES) + +gen_tile_test_SOURCES = \ + src/gen_tile_test.cpp \ + src/metatile.cpp \ + src/request_queue.c \ + src/protocol_helper.c \ + src/daemon.c \ + src/daemon_compat.c \ + src/gen_tile.cpp \ + src/sys_utils.c \ + src/cache_expire.c \ + src/parameterize_style.cpp \ + $(STORE_SOURCES) gen_tile_test_CFLAGS = -DMAIN_ALREADY_DEFINED $(PTHREAD_CFLAGS) gen_tile_test_CXXFLAGS = $(MAPNIK_CFLAGS) gen_tile_test_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) -liniparser -CLEANFILES=*.slo mod_tile.la stderr.out src/*.slo src/*.lo src/.libs/* src/*.la +CLEANFILES=*.slo mod_tile.la stderr.out src/*.slo src/*.lo src/.libs/* src/*.la test: gen_tile_test ./gen_tile_test all-local: - $(APXS) -c $(DEF_LDLIBS) $(AM_CFLAGS) -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) @srcdir@/src/mod_tile.c @srcdir@/src/sys_utils.c @srcdir@/src/store.c @srcdir@/src/store_file.c @srcdir@/src/store_file_utils.c @srcdir@/src/store_memcached.c @srcdir@/src/store_rados.c @srcdir@/src/store_ro_http_proxy.c @srcdir@/src/store_ro_composite.c @srcdir@/src/store_null.c + $(APXS) -c $(DEF_LDLIBS) $(AM_CFLAGS) \ + -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) \ + @srcdir@/src/mod_tile.c \ + @srcdir@/src/sys_utils.c \ + @srcdir@/src/store.c \ + @srcdir@/src/store_file.c \ + @srcdir@/src/store_file_utils.c \ + @srcdir@/src/store_memcached.c \ + @srcdir@/src/store_rados.c \ + @srcdir@/src/store_ro_http_proxy.c \ + @srcdir@/src/store_ro_composite.c \ + @srcdir@/src/store_null.c install-mod_tile: mkdir -p $(DESTDIR)`$(APXS) -q LIBEXECDIR` - $(APXS) -S LIBEXECDIR=$(DESTDIR)`$(APXS) -q LIBEXECDIR` -c -i $(DEF_LDLIBS) $(AM_CFLAGS) -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) @srcdir@/src/mod_tile.c @srcdir@/src/sys_utils.c @srcdir@/src/store.c @srcdir@/src/store_file.c @srcdir@/src/store_file_utils.c @srcdir@/src/store_memcached.c @srcdir@/src/store_rados.c @srcdir@/src/store_ro_http_proxy.c @srcdir@/src/store_ro_composite.c @srcdir@/src/store_null.c - - + $(APXS) -S LIBEXECDIR=$(DESTDIR)`$(APXS) \ + -q LIBEXECDIR` -c -i $(DEF_LDLIBS) $(AM_CFLAGS) \ + -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) \ + @srcdir@/src/mod_tile.c \ + @srcdir@/src/sys_utils.c \ + @srcdir@/src/store.c \ + @srcdir@/src/store_file.c \ + @srcdir@/src/store_file_utils.c \ + @srcdir@/src/store_memcached.c \ + @srcdir@/src/store_rados.c \ + @srcdir@/src/store_ro_http_proxy.c \ + @srcdir@/src/store_ro_composite.c \ + @srcdir@/src/store_null.c