Re: [PATCH wayland 2/3] doc: make the doxygen output dependent on scanner.c

2015-11-16 Thread Bryce Harrington 
On Thu, Nov 05, 2015 at 02:21:02PM -0800, Bryce Harrington wrote:
> On Fri, Nov 06, 2015 at 08:02:00AM +1000, Peter Hutterer wrote:
> > When the scanner changes, we need to rebuild
> > 
> > Signed-off-by: Peter Hutterer 
> 
> Reviewed-by: Bryce Harrington 

Thanks, pushed:

remote: I: patch #63925 updated using rev 
5660ea414f9a2a81409074346bb6140342e02425
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/wayland/wayland
   10d5f97..5660ea4  master -> master


> > ---
> >  doc/doxygen/Makefile.am | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
> > index 5520d39..a8bb95f 100644
> > --- a/doc/doxygen/Makefile.am
> > +++ b/doc/doxygen/Makefile.am
> > @@ -44,14 +44,14 @@ $(diagrams): $(diagramssrc)
> >  
> >  $(diagram_maps):  $(diagramssrc)
> >  
> > -xml/%/index.xml: $(scanned_src_files_%) wayland.doxygen $(diagrams) 
> > $(diagram_maps) | xml/%
> > +xml/%/index.xml: $(top_srcdir)/src/scanner.c $(scanned_src_files_%) 
> > wayland.doxygen $(diagrams) $(diagram_maps) | xml/%
> > $(AM_V_GEN)(cat wayland.doxygen; \
> >echo "GENERATE_XML=YES"; \
> >echo "XML_OUTPUT=xml/$*"; \
> >echo "INPUT= $(scanned_src_files_$*)"; \
> >) | $(DOXYGEN) -
> >  
> > -man/man3/wl_display.3: $(scanned_src_files_man) wayland.doxygen | man/man3
> > +man/man3/wl_display.3: $(top_srcdir)/src/scanner.c 
> > $(scanned_src_files_man) wayland.doxygen | man/man3
> > $(AM_V_GEN)(cat wayland.doxygen; \
> >echo "GENERATE_MAN=YES"; \
> >echo "MAN_OUTPUT=man"; \
> > -- 
> > 2.4.3
> > 
> > ___
> > 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
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH wayland 2/3] doc: make the doxygen output dependent on scanner.c

2015-11-05 Thread Bryce Harrington 
On Fri, Nov 06, 2015 at 08:02:00AM +1000, Peter Hutterer wrote:
> When the scanner changes, we need to rebuild
> 
> Signed-off-by: Peter Hutterer 

Reviewed-by: Bryce Harrington 
> ---
>  doc/doxygen/Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
> index 5520d39..a8bb95f 100644
> --- a/doc/doxygen/Makefile.am
> +++ b/doc/doxygen/Makefile.am
> @@ -44,14 +44,14 @@ $(diagrams): $(diagramssrc)
>  
>  $(diagram_maps):  $(diagramssrc)
>  
> -xml/%/index.xml: $(scanned_src_files_%) wayland.doxygen $(diagrams) 
> $(diagram_maps) | xml/%
> +xml/%/index.xml: $(top_srcdir)/src/scanner.c $(scanned_src_files_%) 
> wayland.doxygen $(diagrams) $(diagram_maps) | xml/%
>   $(AM_V_GEN)(cat wayland.doxygen; \
>echo "GENERATE_XML=YES"; \
>echo "XML_OUTPUT=xml/$*"; \
>echo "INPUT= $(scanned_src_files_$*)"; \
>) | $(DOXYGEN) -
>  
> -man/man3/wl_display.3: $(scanned_src_files_man) wayland.doxygen | man/man3
> +man/man3/wl_display.3: $(top_srcdir)/src/scanner.c $(scanned_src_files_man) 
> wayland.doxygen | man/man3
>   $(AM_V_GEN)(cat wayland.doxygen; \
>echo "GENERATE_MAN=YES"; \
>echo "MAN_OUTPUT=man"; \
> -- 
> 2.4.3
> 
> ___
> 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 wayland 2/3] doc: make the doxygen output dependent on scanner.c

2015-11-05 Thread Peter Hutterer 
When the scanner changes, we need to rebuild

Signed-off-by: Peter Hutterer 
---
 doc/doxygen/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 5520d39..a8bb95f 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -44,14 +44,14 @@ $(diagrams): $(diagramssrc)
 
 $(diagram_maps):  $(diagramssrc)
 
-xml/%/index.xml: $(scanned_src_files_%) wayland.doxygen $(diagrams) 
$(diagram_maps) | xml/%
+xml/%/index.xml: $(top_srcdir)/src/scanner.c $(scanned_src_files_%) 
wayland.doxygen $(diagrams) $(diagram_maps) | xml/%
$(AM_V_GEN)(cat wayland.doxygen; \
   echo "GENERATE_XML=YES"; \
   echo "XML_OUTPUT=xml/$*"; \
   echo "INPUT= $(scanned_src_files_$*)"; \
   ) | $(DOXYGEN) -
 
-man/man3/wl_display.3: $(scanned_src_files_man) wayland.doxygen | man/man3
+man/man3/wl_display.3: $(top_srcdir)/src/scanner.c $(scanned_src_files_man) 
wayland.doxygen | man/man3
$(AM_V_GEN)(cat wayland.doxygen; \
   echo "GENERATE_MAN=YES"; \
   echo "MAN_OUTPUT=man"; \
-- 
2.4.3

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