doc: Invoke doxygen via the defined make variable.

Submitted by Jon Cruz on Dec. 3, 2014, 1:54 a.m.

Details

Message ID 1417571647-14149-1-git-send-email-jonc@osg.samsung.com
State Accepted
Commit 962de0d0cc53f6ec737d18e6f8f9483d05e41dbb
Headers show

Not browsing as part of any series.

Commit Message

Jon Cruz Dec. 3, 2014, 1:54 a.m.
Invoke doxygen via the autoconf-defined make variable instead of directly.
This brings it in line with standard makefile practices.

Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
---
 doc/doxygen/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 83622af..f8d636e 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -28,14 +28,14 @@  xml/client/index.xml: $(scanned_src_files_client) wayland.doxygen
           echo "GENERATE_XML=YES"; \
           echo "XML_OUTPUT=xml/client"; \
           echo "INPUT= $(scanned_src_files_client)"; \
-          ) | doxygen -
+          ) | $(DOXYGEN) -
 xml/server/index.xml: $(scanned_src_files_server) wayland.doxygen
 	$(AM_V_GEN)$(MKDIR_P) xml/server && \
 	(cat wayland.doxygen; \
           echo "GENERATE_XML=YES"; \
           echo "XML_OUTPUT=xml/server"; \
           echo "INPUT= $(scanned_src_files_server)"; \
-          ) | doxygen -
+          ) | $(DOXYGEN) -
 
 man/man3/wl_display.3: $(scanned_src_files_client) $(scanned_src_files_server)
 	$(AM_V_GEN)(cat wayland.doxygen; \
@@ -43,7 +43,7 @@  man/man3/wl_display.3: $(scanned_src_files_client) $(scanned_src_files_server)
           echo "MAN_OUTPUT=man"; \
           echo "JAVADOC_AUTOBRIEF=NO"; \
           echo "INPUT= $^"; \
-          ) | doxygen -
+          ) | $(DOXYGEN) -
 
 # there is no man-local
 all-local: man/man3/wl_display.3

Comments

On Tue, Dec 02, 2014 at 05:54:07PM -0800, Jon A. Cruz wrote:
> Invoke doxygen via the autoconf-defined make variable instead of directly.
> This brings it in line with standard makefile practices.
> 
> Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Cheers,
   Peter


> ---
>  doc/doxygen/Makefile.am | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
> index 83622af..f8d636e 100644
> --- a/doc/doxygen/Makefile.am
> +++ b/doc/doxygen/Makefile.am
> @@ -28,14 +28,14 @@ xml/client/index.xml: $(scanned_src_files_client) wayland.doxygen
>            echo "GENERATE_XML=YES"; \
>            echo "XML_OUTPUT=xml/client"; \
>            echo "INPUT= $(scanned_src_files_client)"; \
> -          ) | doxygen -
> +          ) | $(DOXYGEN) -
>  xml/server/index.xml: $(scanned_src_files_server) wayland.doxygen
>  	$(AM_V_GEN)$(MKDIR_P) xml/server && \
>  	(cat wayland.doxygen; \
>            echo "GENERATE_XML=YES"; \
>            echo "XML_OUTPUT=xml/server"; \
>            echo "INPUT= $(scanned_src_files_server)"; \
> -          ) | doxygen -
> +          ) | $(DOXYGEN) -
>  
>  man/man3/wl_display.3: $(scanned_src_files_client) $(scanned_src_files_server)
>  	$(AM_V_GEN)(cat wayland.doxygen; \
> @@ -43,7 +43,7 @@ man/man3/wl_display.3: $(scanned_src_files_client) $(scanned_src_files_server)
>            echo "MAN_OUTPUT=man"; \
>            echo "JAVADOC_AUTOBRIEF=NO"; \
>            echo "INPUT= $^"; \
> -          ) | doxygen -
> +          ) | $(DOXYGEN) -
>  
>  # there is no man-local
>  all-local: man/man3/wl_display.3
> -- 
> 1.9.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
On Wed, 3 Dec 2014 13:44:56 +1000
Peter Hutterer <peter.hutterer@who-t.net> wrote:

> On Tue, Dec 02, 2014 at 05:54:07PM -0800, Jon A. Cruz wrote:
> > Invoke doxygen via the autoconf-defined make variable instead of directly.
> > This brings it in line with standard makefile practices.
> > 
> > Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
> 
> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Pushed, thanks,
pq