From 31185c24f0039e36a0993b624fc94bc61d3cd04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 1 Dec 2019 23:49:04 -0500
Subject: [PATCH] build/autoconf: always build doc Makefile
---
Makefile.am | 2 --
configure.ac | 6 ++----
doc/Makefile.am | 5 ++++-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a89a7933..7ba6efbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,7 @@ if ENABLE_TESTS
SUBDIRS += tests
endif
-if HAVE_DOXYGEN
SUBDIRS += doc
-endif
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index d8740501..5a425505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,10 +210,6 @@ AM_COND_IF(ENABLE_PROXY_CLIENT, [CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT"], [])
AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS"], [])
AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY"], [])
-AM_COND_IF([HAVE_DOXYGEN], [
- AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])
-])
-
dnl Configure setup.py if we build the python module
AM_COND_IF([USE_CYTHON], [
AC_SUBST(CURRENT_SOURCE_DIR, ".")
@@ -227,5 +223,7 @@ AC_CONFIG_FILES([Makefile
src/Makefile
tools/Makefile
tests/Makefile
+ doc/Makefile
+ doc/Doxyfile
opendht.pc])
AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ab00293b..0ac8f911 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,10 @@
dist_man1_MANS = dhtnode.1
+noinst_HEADERS = \
+ Doxyfile
+
if HAVE_DOXYGEN
-doxyfile.stamp:
+doxyfile.stamp: Doxyfile
$(DOXYGEN) Doxyfile
echo stamp > doxyfile.stamp
--
GitLab