From 8dc36788e7bde7f225ed9f0bd8e6472be0e839a6 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Thu, 10 Oct 2019 06:59:48 +0200 Subject: doc: Restore distribution of generated man pages - All generated content should be kept out of git - End users should not need to have doxygen installed - Manual pages should be included in dist tar/zip files, for downstream packagers and end-users Signed-off-by: Joachim Nilsson --- Makefile.am | 4 ++++ configure.ac | 2 ++ doc/Makefile.am | 1 + doc/man/Makefile.am | 1 + doc/man/man3/Makefile.am | 4 ++++ 5 files changed, 12 insertions(+) create mode 100644 doc/man/Makefile.am create mode 100644 doc/man/man3/Makefile.am diff --git a/Makefile.am b/Makefile.am index feccc81..b515796 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,10 @@ endif doc: doxygen-doc $(AM_V_GEN)cd $(DX_DOCDIR) && ./fixmanpages && cd - + +## The distribution should include man pages, which are generated +dist-hook: doc + ## Generate MD5 checksum file MD5 = md5sum md5-dist: diff --git a/configure.ac b/configure.ac index b85de9f..ada87dd 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,8 @@ AC_CONFIG_FILES([Makefile \ Doxyfile \ libnet-config \ doc/Makefile \ + doc/man/Makefile \ + doc/man/man3/Makefile \ include/Makefile \ include/libnet.h \ libnet.pc \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 9aefdb0..1f4dc3a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = man dist_doc_DATA = MIGRATION RAWSOCKET_NON_SEQUITUR EXTRA_DIST = fixmanpages.in libnet.Pod EXTRA_DIST += api-main.md api-head.html api-foot.html api-style.css diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am new file mode 100644 index 0000000..c638ab2 --- /dev/null +++ b/doc/man/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = man3 diff --git a/doc/man/man3/Makefile.am b/doc/man/man3/Makefile.am new file mode 100644 index 0000000..ef1bafe --- /dev/null +++ b/doc/man/man3/Makefile.am @@ -0,0 +1,4 @@ +man3_MANS = $(srcdir)/libnet.3 \ + $(srcdir)/libnet-functions.3 \ + $(srcdir)/libnet-macros.3 +EXTRA_DIST = $(man3_MANS) -- cgit v1.2.1