diff options
| author | Johan Dahlin <jdahlin@async.com.br> | 2006-08-21 18:56:25 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2006-08-21 18:56:25 +0000 |
| commit | b1ae2d3303e7999d79478811f68e2ab4b68cb7ff (patch) | |
| tree | 6dc10336db759d29a7f5b8ff4f16a1e84f5b9f9d | |
| parent | ecf9af17b1d6e93a883f18bd6366eb68897559ae (diff) | |
| download | pygobject-b1ae2d3303e7999d79478811f68e2ab4b68cb7ff.tar.gz pygobject-b1ae2d3303e7999d79478811f68e2ab4b68cb7ff.tar.xz pygobject-b1ae2d3303e7999d79478811f68e2ab4b68cb7ff.zip | |
Always install the xsl files & css files, regardless if the documentation
2006-08-21 Johan Dahlin <jdahlin@async.com.br>
* Makefile.am:
* docs/Makefile.am:
Always install the xsl files & css files, regardless if the
documentation was actually built or not. Also clean it up considerably.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | docs/Makefile.am | 84 |
3 files changed, 47 insertions, 49 deletions
@@ -1,3 +1,10 @@ +2006-08-21 Johan Dahlin <jdahlin@async.com.br> + + * Makefile.am: + * docs/Makefile.am: + Always install the xsl files & css files, regardless if the + documentation was actually built or not. Also clean it up considerably. + 2006-08-17 Gustavo J. A. M. Carneiro <gjc@gnome.org> * gobject/gobjectmodule.c (pyg_type_register): Move the interface diff --git a/Makefile.am b/Makefile.am index da49dba..d0d237c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,6 @@ AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = gobject examples tests -if ENABLE_DOCS - SUBDIRS += docs -endif +SUBDIRS = docs gobject examples tests PLATFORM_VERSION = 2.0 diff --git a/docs/Makefile.am b/docs/Makefile.am index e08028e..0eba533 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,31 @@ REF_VERSION = $(PYGOBJECT_MAJOR_VERSION).$(PYGOBJECT_MINOR_VERSION) FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION) -XMLFILES = \ +BUILDDIR = $(top_builddir)/docs + +CSS_FILES = style.css + +if ENABLE_DOCS +HTML_FILES = \ + html/class-gobjectgboxed.html \ + html/class-gobjectginterface.html \ + html/class-gobjectgpointer.html \ + html/class-gobject.html \ + html/class-gobjectmaincontext.html \ + html/class-gobjectmainloop.html \ + html/gobject-class-reference.html \ + html/gobject-constants.html \ + html/gobject-functions.html \ + html/index.html \ + html/index.sgml \ + html/pygobject.devhelp \ + html/pygobject-introduction.html \ + html/pygobject-reference-copyright.html +else +HTML_FILES = +endif + +XML_FILES = \ reference/pygobject.xml \ reference/pygobject-introduction.xml \ reference/pygobject-classes.xml \ @@ -14,7 +38,7 @@ XMLFILES = \ reference/pygobject-maincontext.xml \ reference/pygobject-mainloop.xml -XSLFILES = \ +XSL_FILES = \ xsl/common.xsl \ xsl/devhelp.xsl \ xsl/fixxref.py \ @@ -23,66 +47,36 @@ XSLFILES = \ xsl/pdf.xsl \ xsl/ref-html-style.xsl -XSLdir = $(datadir)/pygobject/xsl -XSL_DATA = $(XSLFILES) - -BUILDDIR = $(top_builddir)/docs +CSSdir = $(HTMLdir) +CSS_DATA = $(CSS_FILES) HTMLdir = $(datadir)/gtk-doc/html/pygobject -HTML_DATA = \ - html/pygobject-introduction.html \ - html/pygobject-reference-copyright.html \ - html/class-gobjectgboxed.html \ - html/class-gobjectginterface.html \ - html/class-gobjectgpointer.html \ - html/class-gobject.html \ - html/class-gobjectmaincontext.html \ - html/class-gobjectmainloop.html \ - html/gobject-class-reference.html \ - html/gobject-constants.html \ - html/gobject-functions.html \ - html/index.html \ - html/index.sgml \ - html/pygobject.devhelp +HTML_DATA = $(HTML_FILES) -CSS_FILES = style.css -CSSdir = $(HTMLdir) -CSS_DATA = $(CSS_FILES) +XSLdir = $(datadir)/pygobject/xsl +XSL_DATA = $(XSL_FILES) -BUILT_SOURCES = \ - build_stamp \ - reference/builddate.xml \ - $(HTML_DATA) +BUILT_SOURCES = reference/builddate.xml $(HTML_FILES) -CLEANFILES = \ - build_stamp \ - pygobject-ref.* \ - reference/builddate.xml \ - $(HTML_DATA) +CLEANFILES = build_stamp reference/builddate.xml $(HTML_FILES) -EXTRA_DIST = \ - $(XMLFILES) \ - $(XSLFILES) \ - $(CSS_FILES) +EXTRA_DIST = $(XML_FILES) $(XSL_FILES) $(CSS_FILES) -REFERENCE_DEPS = \ - reference \ - $(XMLFILES) \ - $(XSLFILES) +REFERENCE_DEPS = reference $(XML_FILES) $(XSL_FILES) -$(HTML_DATA): build_stamp +$(HTML_FILES): build_stamp reference/builddate.xml: $(REFERENCE_DEPS) - $(PYTHON) -c 'import datetime; print datetime.date.today()' > $@ + @$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@ build_stamp: $(REFERENCE_DEPS) reference/builddate.xml - xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \ + @xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \ --path $(BUILDDIR)/reference:$(srcdir)/reference \ --stringparam gtkdoc.bookname "pygobject" \ --stringparam gtkdoc.version ${REF_VERSION} \ $(srcdir)/xsl/ref-html-style.xsl \ $(srcdir)/reference/pygobject-ref.xml - touch $@ + @touch $@ pdf: $(REFERENCE_DEPS) reference/builddate.xml xsltproc --nonet --xinclude -o pygobject-ref.fo xsl/pdf-style.xsl \ |