On Wed, Jun 15, 2011 at 06:05:41PM -0400, Gaetan Nadon wrote: > It is no longer used in the specs dir. > Remove html from CLEANFILES as it breaks. Make do not clean directories > Remove SUFFIXES as pattern rules are used rather than suffix rules. > > Other improvements are possible, the first priority is to move it out > of the specs dir. > > Signed-off-by: Gaetan Nadon <[email protected]>
Acked-by: Peter Hutterer <[email protected]> Cheers, Peter > --- > nls/Makefile.am | 5 +++- > nls/xmlrules.in | 59 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > specs/xmlrules.in | 12 +--------- > 3 files changed, 65 insertions(+), 11 deletions(-) > create mode 100644 nls/xmlrules.in > > diff --git a/nls/Makefile.am b/nls/Makefile.am > index 470a048..cabaf40 100644 > --- a/nls/Makefile.am > +++ b/nls/Makefile.am > @@ -1,8 +1,11 @@ > > x11localedir = $(X11_LOCALEDATADIR) > specdir = $(docdir)/Compose > +CLEANFILES = > +XMLTO_FLAGS = > +SUFFIXES = > > -include $(top_srcdir)/specs/xmlrules.in > +include $(top_srcdir)/nls/xmlrules.in > > EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \ > compose-check.pl compose-chart.pl > diff --git a/nls/xmlrules.in b/nls/xmlrules.in > new file mode 100644 > index 0000000..5a6be24 > --- /dev/null > +++ b/nls/xmlrules.in > @@ -0,0 +1,59 @@ > +# > +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. > +# > +# Permission is hereby granted, free of charge, to any person obtaining a > +# copy of this software and associated documentation files (the "Software"), > +# to deal in the Software without restriction, including without limitation > +# the rights to use, copy, modify, merge, publish, distribute, sublicense, > +# and/or sell copies of the Software, and to permit persons to whom the > +# Software is furnished to do so, subject to the following conditions: > +# > +# The above copyright notice and this permission notice (including the next > +# paragraph) shall be included in all copies or substantial portions of the > +# Software. > +# > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > +# DEALINGS IN THE SOFTWARE. > +# > + > +if HAVE_XMLTO > +spec_DATA = $(doc_sources:.xml=.html) > + > +if HAVE_FOP > +spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) > +endif > + > +if HAVE_XMLTO_TEXT > +spec_DATA += $(doc_sources:.xml=.txt) > +endif > + > +if HAVE_STYLESHEETS > +XMLTO_FLAGS += \ > + -m $(XSL_STYLESHEET) \ > + --stringparam img.src.path=$(abs_builddir)/ \ > + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css > +endif > + > +CLEANFILES += $(spec_DATA) > + > +%.txt: %.xml $(dist_spec_DATA) > + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< > + > +%.html: %.xml $(dist_spec_DATA) > + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< > + > +%.pdf: %.xml $(dist_spec_DATA) > + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< > + > +%.ps: %.xml $(dist_spec_DATA) > + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< > + > +chunked-html: $(doc_sources) > + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) > + > +endif HAVE_XMLTO > diff --git a/specs/xmlrules.in b/specs/xmlrules.in > index 7687860..8b105f3 100644 > --- a/specs/xmlrules.in > +++ b/specs/xmlrules.in > @@ -21,10 +21,6 @@ > # DEALINGS IN THE SOFTWARE. > # > > -CLEANFILES = > -SUFFIXES = > -XMLTO_FLAGS = > - > if HAVE_XMLTO > spec_DATA = $(doc_sources:.xml=.html) > > @@ -37,15 +33,13 @@ spec_DATA += $(doc_sources:.xml=.txt) > endif > > if HAVE_STYLESHEETS > -XMLTO_FLAGS += \ > +XMLTO_FLAGS = \ > -m $(XSL_STYLESHEET) \ > --stringparam img.src.path=$(abs_builddir)/ \ > --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css > endif > > -CLEANFILES += $(spec_DATA) > - > -SUFFIXES += .xml .ps .pdf .txt .html > +CLEANFILES = $(spec_DATA) > > %.txt: %.xml $(dist_spec_DATA) > $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< > @@ -62,6 +56,4 @@ SUFFIXES += .xml .ps .pdf .txt .html > chunked-html: $(doc_sources) > $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) > > -CLEANFILES += html > - > endif HAVE_XMLTO > -- > 1.7.4.1 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
