[PATCH 3/5] doc: fix doxygen->man command line

Bill Spitzak spitzak at gmail.com
Tue Dec 9 17:01:11 PST 2014


It was telling it to scan the doxyfile as well as the C source, and
listing some source files more than once.
---
 doc/doxygen/Makefile.am |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 7276f5c..8d563f4 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -17,6 +17,11 @@ scanned_src_files_server = 				\
 	$(top_srcdir)/src/wayland-server.h	\
 	$(top_srcdir)/src/wayland-shm.c
 
+scanned_src_files_man =					\
+	$(scanned_src_files_server)			\
+	$(top_srcdir)/src/wayland-client.c	\
+	$(top_srcdir)/src/wayland-client.h
+
 # find all man/man3/wl_foo.3 pages
 # for this to work, we need to create them before the man target (hence
 # all-local below)
@@ -39,12 +44,12 @@ xml/server/index.xml: $(scanned_src_files_server) wayland.doxygen | xml/server
           echo "INPUT= $(scanned_src_files_server)"; \
           ) | $(DOXYGEN) -
 
-man/man3/wl_display.3: $(scanned_src_files_client) $(scanned_src_files_server) wayland.doxygen | man/man3
+man/man3/wl_display.3: $(scanned_src_files_man) wayland.doxygen | man/man3
 	$(AM_V_GEN)(cat wayland.doxygen; \
           echo "GENERATE_MAN=YES"; \
           echo "MAN_OUTPUT=man"; \
           echo "JAVADOC_AUTOBRIEF=NO"; \
-          echo "INPUT= $^"; \
+          echo "INPUT= $(scanned_src_files_man)"; \
           ) | $(DOXYGEN) -
 
 # general rule to create one of the listed directories.
-- 
1.7.9.5



More information about the wayland-devel mailing list