[PATCH xserver 6/8] xmlrules.in: specify the xserver entities depedencies on the target

Alan Coopersmith alan.coopersmith at oracle.com
Thu Nov 18 16:44:05 PST 2010


Gaetan Nadon wrote:
> The generated docs will rebuild when the xserver.ent file changes.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  doc/xml/xmlrules.in |   11 +++--------
>  1 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in
> index 468cfaf..2817d2c 100644
> --- a/doc/xml/xmlrules.in
> +++ b/doc/xml/xmlrules.in
> @@ -48,17 +48,17 @@ endif
>  
>  if HAVE_XMLTO_TEXT
>  BUILT_DOC_FILES += $(TXT_FILES)
> -%.txt: %.xml
> +%.txt: %.xml $(XML_ENT_DIR)/xserver.ent
>  	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
>  endif
>  
>  BUILT_DOC_FILES += $(HTML_FILES)
> -%.html: %.xml
> +%.html: %.xml $(XML_ENT_DIR)/xserver.ent
>  	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
>  
>  if HAVE_FOP
>  BUILT_DOC_FILES += $(PDF_FILES)
> -%.pdf: %.xml
> +%.pdf: %.xml $(XML_ENT_DIR)/xserver.ent
>  	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
>  endif
>  
> @@ -66,8 +66,3 @@ endif HAVE_XMLTO
>  
>  CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES)
>  
> -# All the files we build depend on the entities
> -$(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent
> -
> -$(XML_ENT_DIR)/xserver.ent:
> -	(cd $(XML_ENT_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F))

I don't see what this buys you, but it seems to lose the building
of xserver.ent when needed.   (Though since it's built by configure
I guess it shouldn't be needed except in unusual circumstances.)

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list