From 803354552fff338d276e0d1c8db92cee9582eb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20D=C3=A9saulniers?= <sim.desaulniers@gmail.com>
Date: Thu, 30 Jun 2016 00:58:04 +0200
Subject: [PATCH] build-tools: distribute dhtnode.1 manpage
---
CMakeLists.txt | 1 +
Makefile.am | 2 --
configure.ac | 4 ++--
doc/Makefile.am | 4 ++++
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e5ae1f5..7a5d0542 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,7 @@ endif ()
if (OPENDHT_TOOLS)
add_subdirectory(tools)
endif ()
+add_subdirectory(doc)
if (OPENDHT_PYTHON)
add_subdirectory(python)
diff --git a/Makefile.am b/Makefile.am
index eeb24dd0..8e4e6045 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,9 +10,7 @@ if USE_CYTHON
SUBDIRS += python
endif
-if HAVE_DOXYGEN
SUBDIRS += doc
-endif
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index c9e50a08..777d71cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Check for Doxygen
AC_ARG_ENABLE([doc], AS_HELP_STRING([--enable-doc], [Enable documentation generation (doxygen)]))
AS_IF([test "x$enable_doc" = "xyes"], [
AC_CHECK_PROGS([DOXYGEN], [doxygen])
- AS_IF([test -z "$DOXYGEN"], [AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])])
+ AS_IF([test -z "$DOXYGEN"], [AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])])
])
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
@@ -88,7 +88,7 @@ AM_COND_IF([ENABLE_TOOLS], [
])
])
-AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])])
+AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])
dnl Configure setup.py if we build the python module
AM_COND_IF([USE_CYTHON], [
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 51bc7996..ab00293b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,6 @@
+dist_man1_MANS = dhtnode.1
+
+if HAVE_DOXYGEN
doxyfile.stamp:
$(DOXYGEN) Doxyfile
echo stamp > doxyfile.stamp
@@ -7,3 +10,4 @@ CLEANFILES = doxyfile.stamp
all-local: doxyfile.stamp
clean-local:
rm -rf $(top_srcdir)/doc/man $(top_srcdir)/doc/html
+endif
--
GitLab