[PATCH 1/4] doc: don't duplicate files for doxygen->man input

Bill Spitzak spitzak at gmail.com
Fri Dec 5 19:04:05 PST 2014


I was not sure if this is a problem but it seems wrong to have the same
.c file listed twice as doxygen input.
---
 doc/doxygen/Makefile.am |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index f8d636e..6c87743 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -17,6 +17,14 @@ scanned_src_files_server = 				\
 	$(top_srcdir)/src/wayland-server.h	\
 	$(top_srcdir)/src/wayland-shm.c
 
+scanned_src_files_man =					\
+	$(scanned_src_files_shared)			\
+	$(top_srcdir)/src/wayland-client.c	\
+	$(top_srcdir)/src/wayland-client.h	\
+	$(top_srcdir)/src/wayland-server.c	\
+	$(top_srcdir)/src/wayland-server.h	\
+	$(top_srcdir)/src/wayland-shm.c
+
 # 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)
@@ -29,6 +37,7 @@ xml/client/index.xml: $(scanned_src_files_client) wayland.doxygen
           echo "XML_OUTPUT=xml/client"; \
           echo "INPUT= $(scanned_src_files_client)"; \
           ) | $(DOXYGEN) -
+
 xml/server/index.xml: $(scanned_src_files_server) wayland.doxygen
 	$(AM_V_GEN)$(MKDIR_P) xml/server && \
 	(cat wayland.doxygen; \
@@ -37,12 +46,12 @@ xml/server/index.xml: $(scanned_src_files_server) wayland.doxygen
           echo "INPUT= $(scanned_src_files_server)"; \
           ) | $(DOXYGEN) -
 
-man/man3/wl_display.3: $(scanned_src_files_client) $(scanned_src_files_server)
+man/man3/wl_display.3: $(scanned_src_files_man) wayland.doxygen
 	$(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) -
 
 # there is no man-local
-- 
1.7.9.5



More information about the wayland-devel mailing list