build/autoconf: always build doc Makefile

savoirfairelinux · Dec 2, 2019 · 31185c24f0039e36a0993b624fc94bc61d3cd04c · 31185c2
1 parent 2f6f8e2
commit 31185c24f0039e36a0993b624fc94bc61d3cd04c
Unified Split

Showing with 6 additions and 7 deletions.

+0 −2 Makefile.am

+2 −4 configure.ac

+4 −1 doc/Makefile.am
diff --git 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
@@ -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
@@ -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