diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-10-19 15:00:06 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-11-02 11:48:30 +0100 |
| commit | e6f21c85f2cac9e7d5437b68de470da0e4180b60 (patch) | |
| tree | 07df2136d857bbac821df19c6e1e79888808191a | |
| parent | c96e0a17f369987332ee33746c44ea0133e6d49c (diff) | |
build: no recursive make for "doc/Makefile.am"
Merge the Makefile.am under "doc/" into the toplevel Makefile.am. This
is a step in the effort of dropping recursive make.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | Makefile.am | 60 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | doc/Makefile.am | 30 |
3 files changed, 55 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index af82f021..0ed831a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,8 @@ lib_LTLIBRARIES = noinst_LTLIBRARIES = sbin_PROGRAMS = check_PROGRAMS = +dist_man_MANS = +CLEANFILES = ############################################################################### @@ -290,11 +292,6 @@ src_nft_LDADD = src/libnftables.la ############################################################################### -SUBDIRS = doc - -############################################################################### - - check_PROGRAMS += examples/nft-buffer examples_nft_buffer_AM_CPPFLAGS = -I$(srcdir)/include @@ -307,6 +304,59 @@ examples_nft_json_file_LDADD = src/libnftables.la ############################################################################### +if BUILD_MAN + +dist_man_MANS += \ + doc/nft.8 \ + doc/libnftables-json.5 \ + doc/libnftables.3 \ + $(NULL) + +A2X_OPTS_MANPAGE = \ + -L \ + --doctype manpage \ + --format manpage \ + -D "${builddir}/doc" \ + $(NULL) + +ASCIIDOC_MAIN = doc/nft.txt + +ASCIIDOC_INCLUDES = \ + doc/data-types.txt \ + doc/payload-expression.txt \ + doc/primary-expression.txt \ + doc/stateful-objects.txt \ + doc/statements.txt \ + $(NULL) + +ASCIIDOCS = \ + $(ASCIIDOC_MAIN) \ + $(ASCIIDOC_INCLUDES) \ + $(NULL) + +EXTRA_DIST += \ + $(ASCIIDOCS) \ + doc/libnftables-json.adoc \ + doc/libnftables.adoc \ + $(NULL) + +CLEANFILES += doc/*~ + +doc/nft.8: $(ASCIIDOCS) + $(AM_V_GEN)$(A2X) $(A2X_OPTS_MANPAGE) $< + +.adoc.3: + $(AM_V_GEN)$(A2X) $(A2X_OPTS_MANPAGE) $< + +.adoc.5: + $(AM_V_GEN)$(A2X) $(A2X_OPTS_MANPAGE) $< + +MAINTAINERCLEANFILES = ${dist_man_MANS} + +endif + +############################################################################### + dist_pkgdata_DATA = \ files/nftables/all-in-one.nft \ files/nftables/arp-filter.nft \ diff --git a/configure.ac b/configure.ac index c5e41138..724a4ae7 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,6 @@ AC_CHECK_DECLS([getprotobyname_r, getprotobynumber_r, getservbyport_r], [], [], AC_CONFIG_FILES([ \ Makefile \ libnftables.pc \ - doc/Makefile \ ]) AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index b43cb08d..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -if BUILD_MAN -dist_man_MANS = nft.8 libnftables-json.5 libnftables.3 - -A2X_OPTS_MANPAGE = -L --doctype manpage --format manpage -D ${builddir} - -ASCIIDOC_MAIN = nft.txt -ASCIIDOC_INCLUDES = \ - data-types.txt \ - payload-expression.txt \ - primary-expression.txt \ - stateful-objects.txt \ - statements.txt -ASCIIDOCS = ${ASCIIDOC_MAIN} ${ASCIIDOC_INCLUDES} - -EXTRA_DIST = ${ASCIIDOCS} libnftables-json.adoc libnftables.adoc - -CLEANFILES = \ - *~ - -nft.8: ${ASCIIDOCS} - ${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $< - -.adoc.3: - ${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $< - -.adoc.5: - ${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $< - -MAINTAINERCLEANFILES = ${dist_man_MANS} -endif |