Commit 4983dbcf43fd6b3a924b4fe06997f385f1e008fc
2017-07-28T18:19:40
build: change doxygen target to be properly dependency-based This hackery (thanks libinput) is clearer and more precise than the previous hackery. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/Makefile.am b/Makefile.am
index a22bd7a..d46481b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,18 +149,29 @@ src/xkbcomp/parser.h: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xk
if ENABLE_DOCS
if HAVE_DOXYGEN
-doc: doc/stamp-doxygen
+doxygen_input = \
+ $(top_srcdir)/README.md \
+ $(top_srcdir)/doc/quick-guide.md \
+ $(top_srcdir)/doc/compat.md \
+ $(top_srcdir)/xkbcommon/xkbcommon.h \
+ $(top_srcdir)/xkbcommon/xkbcommon-names.h \
+ $(top_srcdir)/xkbcommon/xkbcommon-x11.h \
+ $(top_srcdir)/xkbcommon/xkbcommon-compose.h
+
+doc/html: doc/Doxyfile $(doxygen_input)
+ $(AM_V_GEN)(\
+ cat $<; \
+ echo "INPUT = $(doxygen_input)"; \
+ echo "OUTPUT_DIRECTORY = $(abs_top_builddir)/doc"; \
+ ) | $(DOXYGEN) -
+clean-doxygen:
+ rm -rf doc/html
+
+doc: doc/html
clean-doc: clean-doxygen
all-local:: doc
clean-local:: clean-doc
-doc/stamp-doxygen: $(top_srcdir)/xkbcommon/*.h
- $(AM_V_GEN)(cd $(top_srcdir) && $(DOXYGEN) $(abs_top_builddir)/doc/Doxyfile)
- touch $@
-
-clean-doxygen:
- rm -rf doc/html doc/stamp-doxygen
-
install-data-local:: doc
$(MKDIR_P) $(DESTDIR)$(htmldir)
$(INSTALL_DATA) doc/html/* $(DESTDIR)$(htmldir)
diff --git a/doc/.gitignore b/doc/.gitignore
index 3e70371..63b767d 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,3 +1,2 @@
Doxyfile
html/
-stamp-doxygen
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 36d517d..04a2991 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -2,8 +2,6 @@ PROJECT_NAME = @PACKAGE_NAME@
PROJECT_NUMBER = @PACKAGE_VERSION@
-OUTPUT_DIRECTORY = @abs_top_builddir@/doc
-
BRIEF_MEMBER_DESC = NO
JAVADOC_AUTOBRIEF = YES
@@ -18,13 +16,7 @@ QUIET = YES
WARN_IF_UNDOCUMENTED = NO
-INPUT = README.md \
- doc/quick-guide.md \
- doc/compat.md \
- xkbcommon/xkbcommon.h \
- xkbcommon/xkbcommon-names.h \
- xkbcommon/xkbcommon-x11.h \
- xkbcommon/xkbcommon-compose.h \
+INPUT = @INPUT@
FILE_PATTERNS = *.c \
*.h
@@ -40,7 +32,7 @@ ALPHABETICAL_INDEX = NO
IGNORE_PREFIX = xkb_ \
XKB_
-HTML_EXTRA_STYLESHEET = doc/doxygen-extra.css
+HTML_EXTRA_STYLESHEET = @abs_top_srcdir@/doc/doxygen-extra.css
HTML_TIMESTAMP = NO