Re: [PATCH] doc: Invoke doxygen via the defined make variable.

2014-12-05 Thread Pekka Paalanen
On Wed, 3 Dec 2014 13:44:56 +1000
Peter Hutterer  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 
> 
> Reviewed-by: Peter Hutterer 

Pushed, thanks,
pq
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


Re: [PATCH] doc: Invoke doxygen via the defined make variable.

2014-12-02 Thread Peter Hutterer
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 

Reviewed-by: Peter Hutterer 

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
> 
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


[PATCH] doc: Invoke doxygen via the defined make variable.

2014-12-02 Thread Jon A. Cruz
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 
---
 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