From 64b4eded92d8fd720e3768d93cdf789da27f88bb Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sat, 13 Feb 2016 01:52:41 +0100 Subject: build: explicit man rules --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7b52fa0..cb75753 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,7 @@ blogc.1: man/blogc.1.ronn --pipe \ --organization "Rafael G. Martins" \ --manual "$(PACKAGE_NAME) Manual" \ - $< > $@ + man/blogc.1.ronn > blogc.1 blogc-source.7: man/blogc-source.7.ronn $(AM_V_GEN)$(RONN) \ @@ -131,7 +131,7 @@ blogc-source.7: man/blogc-source.7.ronn --pipe \ --organization "Rafael G. Martins" \ --manual "$(PACKAGE_NAME) Manual" \ - $< > $@ + man/blogc-source.7.ronn > blogc-source.7 blogc-template.7: man/blogc-template.7.ronn $(AM_V_GEN)$(RONN) \ @@ -139,7 +139,7 @@ blogc-template.7: man/blogc-template.7.ronn --pipe \ --organization "Rafael G. Martins" \ --manual "$(PACKAGE_NAME) Manual" \ - $< > $@ + man/blogc-template.7.ronn > blogc-template.7 else -- cgit v1.2.3-18-g5258 From ec5df72939c31bfe644b3b56e8df5f3c04bfe0a6 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sat, 13 Feb 2016 02:01:16 +0100 Subject: build: explicit man rules. take 2 --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index cb75753..832b19c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,7 @@ blogc.1: man/blogc.1.ronn --pipe \ --organization "Rafael G. Martins" \ --manual "$(PACKAGE_NAME) Manual" \ - man/blogc.1.ronn > blogc.1 + $(top_srcdir)/man/blogc.1.ronn > blogc.1 blogc-source.7: man/blogc-source.7.ronn $(AM_V_GEN)$(RONN) \ @@ -131,7 +131,7 @@ blogc-source.7: man/blogc-source.7.ronn --pipe \ --organization "Rafael G. Martins" \ --manual "$(PACKAGE_NAME) Manual" \ - man/blogc-source.7.ronn > blogc-source.7 + $(top_srcdir)/man/blogc-source.7.ronn > blogc-source.7 blogc-template.7: man/blogc-template.7.ronn $(AM_V_GEN)$(RONN) \ @@ -139,7 +139,7 @@ blogc-template.7: man/blogc-template.7.ronn --pipe \ --organization "Rafael G. Martins" \ --manual "$(PACKAGE_NAME) Manual" \ - man/blogc-template.7.ronn > blogc-template.7 + $(top_srcdir)/man/blogc-template.7.ronn > blogc-template.7 else -- cgit v1.2.3-18-g5258 From 3b0f9293a3432023cdca91df01418347d9781ffa Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Fri, 26 Feb 2016 01:04:32 +0100 Subject: build: replace src/utils with squareball --- Makefile.am | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 832b19c..cb91a50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,16 @@ ## Autotools settings +if INTERNAL_SQUAREBALL +SUBDIRS = squareball +endif + ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests \ --enable-ronn \ --disable-valgrind \ + --with-squareball=internal \ $(NULL) @@ -39,7 +44,6 @@ noinst_HEADERS = \ src/renderer.h \ src/source-parser.h \ src/template-parser.h \ - src/utils/utils.h \ $(NULL) noinst_LTLIBRARIES = \ @@ -66,19 +70,17 @@ libblogc_la_SOURCES = \ src/renderer.c \ src/source-parser.c \ src/template-parser.c \ - src/utils/mem.c \ - src/utils/slist.c \ - src/utils/strings.c \ - src/utils/trie.c \ $(NULL) libblogc_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/src \ + $(SQUAREBALL_CFLAGS) \ $(NULL) libblogc_la_LIBADD = \ $(LIBM) \ + $(SQUAREBALL_LIBS) \ $(NULL) @@ -89,10 +91,12 @@ blogc_SOURCES = \ blogc_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/src \ + $(SQUAREBALL_CFLAGS) \ $(NULL) blogc_LDADD = \ libblogc.la \ + $(SQUAREBALL_LIBS) \ $(NULL) @@ -167,7 +171,6 @@ check_PROGRAMS += \ tests/check_renderer \ tests/check_source_parser \ tests/check_template_parser \ - tests/check_utils \ $(NULL) tests_check_error_SOURCES = \ @@ -175,6 +178,7 @@ tests_check_error_SOURCES = \ $(NULL) tests_check_error_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -183,6 +187,7 @@ tests_check_error_LDFLAGS = \ $(NULL) tests_check_error_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -192,6 +197,7 @@ tests_check_loader_SOURCES = \ $(NULL) tests_check_loader_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -202,6 +208,7 @@ tests_check_loader_LDFLAGS = \ $(NULL) tests_check_loader_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -211,6 +218,7 @@ tests_check_content_parser_SOURCES = \ $(NULL) tests_check_content_parser_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -219,6 +227,7 @@ tests_check_content_parser_LDFLAGS = \ $(NULL) tests_check_content_parser_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -228,6 +237,7 @@ tests_check_datetime_parser_SOURCES = \ $(NULL) tests_check_datetime_parser_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -236,6 +246,7 @@ tests_check_datetime_parser_LDFLAGS = \ $(NULL) tests_check_datetime_parser_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -245,6 +256,7 @@ tests_check_renderer_SOURCES = \ $(NULL) tests_check_renderer_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -253,6 +265,7 @@ tests_check_renderer_LDFLAGS = \ $(NULL) tests_check_renderer_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -262,6 +275,7 @@ tests_check_source_parser_SOURCES = \ $(NULL) tests_check_source_parser_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -270,6 +284,7 @@ tests_check_source_parser_LDFLAGS = \ $(NULL) tests_check_source_parser_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -279,6 +294,7 @@ tests_check_template_parser_SOURCES = \ $(NULL) tests_check_template_parser_CFLAGS = \ + $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -287,23 +303,7 @@ tests_check_template_parser_LDFLAGS = \ $(NULL) tests_check_template_parser_LDADD = \ - $(CMOCKA_LIBS) \ - libblogc.la \ - $(NULL) - -tests_check_utils_SOURCES = \ - tests/check_utils.c \ - $(NULL) - -tests_check_utils_CFLAGS = \ - $(CMOCKA_CFLAGS) \ - $(NULL) - -tests_check_utils_LDFLAGS = \ - -no-install \ - $(NULL) - -tests_check_utils_LDADD = \ + $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) -- cgit v1.2.3-18-g5258 From 3ca82ea98fc46e3365c514aa3398f54df91bf329 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Tue, 8 Mar 2016 04:44:43 +0100 Subject: build: added make rule to build srpm --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index cb91a50..1c5388d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -314,6 +314,16 @@ TESTS = \ $(check_PROGRAMS) +## Helpers: dist-srpm +if USE_RPMBUILD +dist-srpm: blogc.spec dist-xz + $(RPMBUILD) \ + --define "_srcrpmdir $(top_builddir)" \ + --define "_sourcedir $(top_builddir)" \ + -bs blogc.spec +endif + + ## Helpers: git-version-gen $(top_srcdir)/.version: -- cgit v1.2.3-18-g5258 From 214d09891909ce5505d7bdbc5c848a9c4be23c0d Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Tue, 8 Mar 2016 20:33:21 +0100 Subject: travis: added script to upload distfiles --- Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 1c5388d..9554599 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ ## File listings EXTRA_DIST = \ - build-aux/build-windows.sh \ build-aux/git-version-gen \ $(top_srcdir)/.version \ autogen.sh \ -- cgit v1.2.3-18-g5258 From 06db24fefadef5056cc2e14b9791a95614ba9ff2 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 9 Mar 2016 03:44:56 +0100 Subject: spec: fixed source dir --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9554599..a0559ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -314,6 +314,7 @@ TESTS = \ ## Helpers: dist-srpm + if USE_RPMBUILD dist-srpm: blogc.spec dist-xz $(RPMBUILD) \ -- cgit v1.2.3-18-g5258 From 74b2ee22a6b60d53b1241e0c52284b288e561599 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 01:38:10 +0200 Subject: moved squareball back to blogc source tree. i don't have enough time to maintain a separated library at this point, and worry about soname bump, library stability, etc. all the code is trivial enough to be copied around, and all the utils are implemented as single file now, to make it easier to copy. --- Makefile.am | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index a0559ea..8237508 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,11 @@ ## Autotools settings -if INTERNAL_SQUAREBALL -SUBDIRS = squareball -endif - ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests \ --enable-ronn \ --disable-valgrind \ - --with-squareball=internal \ $(NULL) @@ -43,6 +38,7 @@ noinst_HEADERS = \ src/renderer.h \ src/source-parser.h \ src/template-parser.h \ + src/utils.h \ $(NULL) noinst_LTLIBRARIES = \ @@ -69,17 +65,16 @@ libblogc_la_SOURCES = \ src/renderer.c \ src/source-parser.c \ src/template-parser.c \ + src/utils.c \ $(NULL) libblogc_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/src \ - $(SQUAREBALL_CFLAGS) \ $(NULL) libblogc_la_LIBADD = \ $(LIBM) \ - $(SQUAREBALL_LIBS) \ $(NULL) @@ -90,12 +85,10 @@ blogc_SOURCES = \ blogc_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/src \ - $(SQUAREBALL_CFLAGS) \ $(NULL) blogc_LDADD = \ libblogc.la \ - $(SQUAREBALL_LIBS) \ $(NULL) @@ -170,6 +163,7 @@ check_PROGRAMS += \ tests/check_renderer \ tests/check_source_parser \ tests/check_template_parser \ + tests/check_utils \ $(NULL) tests_check_error_SOURCES = \ @@ -177,7 +171,6 @@ tests_check_error_SOURCES = \ $(NULL) tests_check_error_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -186,7 +179,6 @@ tests_check_error_LDFLAGS = \ $(NULL) tests_check_error_LDADD = \ - $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -196,7 +188,6 @@ tests_check_loader_SOURCES = \ $(NULL) tests_check_loader_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -207,7 +198,6 @@ tests_check_loader_LDFLAGS = \ $(NULL) tests_check_loader_LDADD = \ - $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -217,7 +207,6 @@ tests_check_content_parser_SOURCES = \ $(NULL) tests_check_content_parser_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -226,7 +215,6 @@ tests_check_content_parser_LDFLAGS = \ $(NULL) tests_check_content_parser_LDADD = \ - $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -236,7 +224,6 @@ tests_check_datetime_parser_SOURCES = \ $(NULL) tests_check_datetime_parser_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -245,7 +232,6 @@ tests_check_datetime_parser_LDFLAGS = \ $(NULL) tests_check_datetime_parser_LDADD = \ - $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -255,7 +241,6 @@ tests_check_renderer_SOURCES = \ $(NULL) tests_check_renderer_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -264,7 +249,6 @@ tests_check_renderer_LDFLAGS = \ $(NULL) tests_check_renderer_LDADD = \ - $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -274,7 +258,6 @@ tests_check_source_parser_SOURCES = \ $(NULL) tests_check_source_parser_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -283,7 +266,6 @@ tests_check_source_parser_LDFLAGS = \ $(NULL) tests_check_source_parser_LDADD = \ - $(SQUAREBALL_LIBS) \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) @@ -293,7 +275,6 @@ tests_check_template_parser_SOURCES = \ $(NULL) tests_check_template_parser_CFLAGS = \ - $(SQUAREBALL_CFLAGS) \ $(CMOCKA_CFLAGS) \ $(NULL) @@ -302,7 +283,23 @@ tests_check_template_parser_LDFLAGS = \ $(NULL) tests_check_template_parser_LDADD = \ - $(SQUAREBALL_LIBS) \ + $(CMOCKA_LIBS) \ + libblogc.la \ + $(NULL) + +tests_check_utils_SOURCES = \ + tests/check_utils.c \ + $(NULL) + +tests_check_utils_CFLAGS = \ + $(CMOCKA_CFLAGS) \ + $(NULL) + +tests_check_utils_LDFLAGS = \ + -no-install \ + $(NULL) + +tests_check_utils_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ $(NULL) -- cgit v1.2.3-18-g5258 From 6f975248895d0300c6fd8783b1138bdd4be00bcc Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 03:22:31 +0200 Subject: blogc-git-receiver: import external tool to blogc repository still in the effort to reduce maintenance work, I'm importing blogc-git-receiver tool to the main blogc repository. the tool is build by default, if needed headers are found. that means that it will probably only be built for posix-compliant operating systems. --- Makefile.am | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 8237508..934e1cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests \ --enable-ronn \ --disable-valgrind \ + --enable-git-receiver \ $(NULL) @@ -43,6 +44,7 @@ noinst_HEADERS = \ noinst_LTLIBRARIES = \ libblogc.la \ + libblogc_utils.la \ $(NULL) noinst_PROGRAMS = \ @@ -52,6 +54,12 @@ bin_PROGRAMS = \ blogc \ $(NULL) +if BUILD_GIT_RECEIVER +bin_PROGRAMS += \ + blogc-git-receiver \ + $(NULL) +endif + check_PROGRAMS = \ $(NULL) @@ -65,7 +73,6 @@ libblogc_la_SOURCES = \ src/renderer.c \ src/source-parser.c \ src/template-parser.c \ - src/utils.c \ $(NULL) libblogc_la_CFLAGS = \ @@ -78,8 +85,18 @@ libblogc_la_LIBADD = \ $(NULL) +libblogc_utils_la_SOURCES = \ + src/utils.c \ + $(NULL) + +libblogc_utils_la_CFLAGS = \ + $(AM_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + + blogc_SOURCES = \ - src/main.c \ + src/blogc.c \ $(NULL) blogc_CFLAGS = \ @@ -89,9 +106,26 @@ blogc_CFLAGS = \ blogc_LDADD = \ libblogc.la \ + libblogc_utils.la \ $(NULL) +if BUILD_GIT_RECEIVER +blogc_git_receiver_SOURCES = \ + src/blogc-git-receiver.c \ + $(NULL) + +blogc_git_receiver_CFLAGS = \ + $(AM_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + +blogc_git_receiver_LDADD = \ + libblogc_utils.la \ + $(NULL) +endif + + ## Build rules: man pages EXTRA_DIST += \ @@ -107,6 +141,14 @@ dist_man_MANS = \ blogc-template.7 \ $(NULL) +if BUILD_GIT_RECEIVER +EXTRA_DIST += \ + $(NULL) + +dist_man_MANS += \ + $(NULL) +endif + MAINTAINERCLEANFILES += \ $(dist_man_MANS) \ $(NULL) @@ -181,6 +223,7 @@ tests_check_error_LDFLAGS = \ tests_check_error_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_loader_SOURCES = \ @@ -200,6 +243,7 @@ tests_check_loader_LDFLAGS = \ tests_check_loader_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_content_parser_SOURCES = \ @@ -217,6 +261,7 @@ tests_check_content_parser_LDFLAGS = \ tests_check_content_parser_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_datetime_parser_SOURCES = \ @@ -234,6 +279,7 @@ tests_check_datetime_parser_LDFLAGS = \ tests_check_datetime_parser_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_renderer_SOURCES = \ @@ -251,6 +297,7 @@ tests_check_renderer_LDFLAGS = \ tests_check_renderer_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_source_parser_SOURCES = \ @@ -268,6 +315,7 @@ tests_check_source_parser_LDFLAGS = \ tests_check_source_parser_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_template_parser_SOURCES = \ @@ -285,6 +333,7 @@ tests_check_template_parser_LDFLAGS = \ tests_check_template_parser_LDADD = \ $(CMOCKA_LIBS) \ libblogc.la \ + libblogc_utils.la \ $(NULL) tests_check_utils_SOURCES = \ @@ -301,7 +350,7 @@ tests_check_utils_LDFLAGS = \ tests_check_utils_LDADD = \ $(CMOCKA_LIBS) \ - libblogc.la \ + libblogc_utils.la \ $(NULL) endif -- cgit v1.2.3-18-g5258 From c4b294c890c28004d33f650b7af5064c4099f608 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 03:51:42 +0200 Subject: blogc-runserver: import external tool to blogc repository still in the effort to reduce maintenance work, I'm importing blogc-runserver tool to the main blogc repository. the tool is build by default, if needed headers and libraries are found. --- Makefile.am | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 934e1cc..7e42b6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-ronn \ --disable-valgrind \ --enable-git-receiver \ + --enable-runserver \ $(NULL) @@ -60,6 +61,12 @@ bin_PROGRAMS += \ $(NULL) endif +if BUILD_RUNSERVER +bin_PROGRAMS += \ + blogc-runserver \ + $(NULL) +endif + check_PROGRAMS = \ $(NULL) @@ -126,6 +133,26 @@ blogc_git_receiver_LDADD = \ endif +if BUILD_RUNSERVER +blogc_runserver_SOURCES = \ + src/blogc-runserver.c \ + $(NULL) + +blogc_runserver_CFLAGS = \ + $(AM_CFLAGS) \ + -I$(top_srcdir)/src \ + $(LIBEVENT_CFLAGS) \ + $(SQUAREBALL_CFLAGS) \ + $(NULL) + +blogc_runserver_LDADD = \ + $(LIBEVENT_LIBS) \ + $(MAGIC_LIBS) \ + libblogc_utils.la \ + $(NULL) +endif + + ## Build rules: man pages EXTRA_DIST += \ @@ -149,6 +176,14 @@ dist_man_MANS += \ $(NULL) endif +if BUILD_RUNSERVER +EXTRA_DIST += \ + $(NULL) + +dist_man_MANS += \ + $(NULL) +endif + MAINTAINERCLEANFILES += \ $(dist_man_MANS) \ $(NULL) -- cgit v1.2.3-18-g5258 From ca6fb024c9632b73713432e30fce978a99f42213 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Fri, 29 Apr 2016 00:57:10 +0200 Subject: man: added man page for blogc-git-receiver --- Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7e42b6d..78b29e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,9 +170,11 @@ dist_man_MANS = \ if BUILD_GIT_RECEIVER EXTRA_DIST += \ + man/blogc-git-receiver.1.ronn \ $(NULL) dist_man_MANS += \ + blogc-git-receiver.1 \ $(NULL) endif @@ -198,6 +200,14 @@ blogc.1: man/blogc.1.ronn --manual "$(PACKAGE_NAME) Manual" \ $(top_srcdir)/man/blogc.1.ronn > blogc.1 +blogc-git-receiver.1: man/blogc-git-receiver.1.ronn + $(AM_V_GEN)$(RONN) \ + --roff \ + --pipe \ + --organization "Rafael G. Martins" \ + --manual "$(PACKAGE_NAME) Manual" \ + $(top_srcdir)/man/blogc-git-receiver.1.ronn > blogc-git-receiver.1 + blogc-source.7: man/blogc-source.7.ronn $(AM_V_GEN)$(RONN) \ --roff \ @@ -219,6 +229,9 @@ else blogc.1: $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 +blogc-git-receiver.1: + $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 + blogc-source.7: $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 -- cgit v1.2.3-18-g5258 From d4003fcfc88df94831cb4a20e890816954f64129 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Fri, 29 Apr 2016 01:17:38 +0200 Subject: man: added man page for blogc-runserver --- Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 78b29e0..6b428cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -180,9 +180,11 @@ endif if BUILD_RUNSERVER EXTRA_DIST += \ + man/blogc-runserver.1.ronn \ $(NULL) dist_man_MANS += \ + blogc-runserver.1 \ $(NULL) endif @@ -208,6 +210,14 @@ blogc-git-receiver.1: man/blogc-git-receiver.1.ronn --manual "$(PACKAGE_NAME) Manual" \ $(top_srcdir)/man/blogc-git-receiver.1.ronn > blogc-git-receiver.1 +blogc-runserver.1: man/blogc-runserver.1.ronn + $(AM_V_GEN)$(RONN) \ + --roff \ + --pipe \ + --organization "Rafael G. Martins" \ + --manual "$(PACKAGE_NAME) Manual" \ + $(top_srcdir)/man/blogc-runserver.1.ronn > blogc-runserver.1 + blogc-source.7: man/blogc-source.7.ronn $(AM_V_GEN)$(RONN) \ --roff \ @@ -232,6 +242,9 @@ blogc.1: blogc-git-receiver.1: $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 +blogc-runserver.1: + $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 + blogc-source.7: $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 -- cgit v1.2.3-18-g5258 From 81c441e147390cb4b707ae9f1dca42481d6bacb2 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Fri, 29 Apr 2016 01:50:25 +0200 Subject: build: fix man page dist --- Makefile.am | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 6b428cb..e18be01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests \ - --enable-ronn \ + --disable-ronn \ --disable-valgrind \ --enable-git-receiver \ --enable-runserver \ @@ -157,9 +157,13 @@ endif EXTRA_DIST += \ man/blogc.1.ronn \ + man/blogc-git-receiver.1.ronn \ + man/blogc-runserver.1.ronn \ man/blogc-source.7.ronn \ man/blogc-template.7.ronn \ man/index.txt \ + blogc-git-receiver.1 \ + blogc-runserver.1 \ $(NULL) dist_man_MANS = \ @@ -169,20 +173,12 @@ dist_man_MANS = \ $(NULL) if BUILD_GIT_RECEIVER -EXTRA_DIST += \ - man/blogc-git-receiver.1.ronn \ - $(NULL) - dist_man_MANS += \ blogc-git-receiver.1 \ $(NULL) endif if BUILD_RUNSERVER -EXTRA_DIST += \ - man/blogc-runserver.1.ronn \ - $(NULL) - dist_man_MANS += \ blogc-runserver.1 \ $(NULL) -- cgit v1.2.3-18-g5258 From 114b36f95116f62bfcf9d79e441ab81aed35454b Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sat, 30 Apr 2016 02:41:00 +0200 Subject: man: added blogc-pagination(7) --- Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index e18be01..d3ab12c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,6 +161,7 @@ EXTRA_DIST += \ man/blogc-runserver.1.ronn \ man/blogc-source.7.ronn \ man/blogc-template.7.ronn \ + man/blogc-pagination.7.ronn \ man/index.txt \ blogc-git-receiver.1 \ blogc-runserver.1 \ @@ -170,6 +171,7 @@ dist_man_MANS = \ blogc.1 \ blogc-source.7 \ blogc-template.7 \ + blogc-pagination.7 \ $(NULL) if BUILD_GIT_RECEIVER @@ -230,6 +232,14 @@ blogc-template.7: man/blogc-template.7.ronn --manual "$(PACKAGE_NAME) Manual" \ $(top_srcdir)/man/blogc-template.7.ronn > blogc-template.7 +blogc-pagination.7: man/blogc-pagination.7.ronn + $(AM_V_GEN)$(RONN) \ + --roff \ + --pipe \ + --organization "Rafael G. Martins" \ + --manual "$(PACKAGE_NAME) Manual" \ + $(top_srcdir)/man/blogc-pagination.7.ronn > blogc-pagination.7 + else blogc.1: @@ -247,6 +257,9 @@ blogc-source.7: blogc-template.7: $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 +blogc-pagination.7: + $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1 + endif -- cgit v1.2.3-18-g5258