diff options
| author | Gustavo J. A. M. Carneiro <gjc@src.gnome.org> | 2007-01-09 23:10:15 +0000 |
|---|---|---|
| committer | Gustavo J. A. M. Carneiro <gjc@src.gnome.org> | 2007-01-09 23:10:15 +0000 |
| commit | fa9e3d4914206dce48051f8d2f6fdb2023dfd496 (patch) | |
| tree | c5a99437fce42dc5227c676c5ccc9cc26cb47666 | |
| parent | fd15b73ff0d5902c79465776244ca5436860a9ac (diff) | |
| download | pygobject-fa9e3d4914206dce48051f8d2f6fdb2023dfd496.tar.gz pygobject-fa9e3d4914206dce48051f8d2f6fdb2023dfd496.tar.xz pygobject-fa9e3d4914206dce48051f8d2f6fdb2023dfd496.zip | |
treat --enable-docs like in gtk+, closes #361722
svn path=/trunk/; revision=635
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | docs/Makefile.am | 40 |
3 files changed, 37 insertions, 14 deletions
@@ -1,3 +1,10 @@ +2007-01-09 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * configure.ac: Turn the option --disable-docs into --enable-docs. + * docs/Makefile.am: Tread --enable-docs like --enable-gtk-doc in + gtk+, i.e. do not ever build docs unless requested, but always + install them if they are found already built. + 2006-12-14 Kjartan Maraas <kmaraas@gnome.org> * autogen.sh: Make this work with automake 1.10 too. diff --git a/configure.ac b/configure.ac index 2328e12..e148879 100644 --- a/configure.ac +++ b/configure.ac @@ -78,8 +78,8 @@ AC_ARG_ENABLE(thread, dnl Building documentation AC_ARG_ENABLE(docs, - AC_HELP_STRING([--disable-docs], [Disable documentation building]),, - enable_docs=yes) + AC_HELP_STRING([--enable-docs], [Enable documentation building]),enable_docs=yes, + enable_docs=no) if test "${enable_docs}" != no; then dnl dnl Check for xsltproc diff --git a/docs/Makefile.am b/docs/Makefile.am index 464d8e6..12170ce 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -20,11 +20,6 @@ HTML_FILES = \ html/pygobject.devhelp \ html/pygobject-introduction.html -if ENABLE_DOCS -BUILT_HTML_FILES = $(HTML_FILES) -else -BUILT_HTML_FILES = -endif XML_FILES = \ reference/pygobject.xml \ @@ -51,18 +46,31 @@ XSL_FILES = \ # so the date is newer then the files in HTML_FILES FIXXREF = xsl/fixxref.py -CSSdir = $(HTMLdir) +TARGET_DIR = $(datadir)/gtk-doc/html/pygobject +CSSdir = $(TARGET_DIR) CSS_DATA = $(CSS_FILES) -HTMLdir = $(datadir)/gtk-doc/html/pygobject -HTML_DATA = $(HTML_FILES) -XSLdir = $(datadir)/pygobject/xsl -XSL_DATA = $(XSL_FILES) $(FIXXREF) +install-data-local: + installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi -BUILT_SOURCES = reference/builddate.xml $(BUILT_HTML_FILES) +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* -CLEANFILES = reference/builddate.xml $(BUILT_HTML_FILES) + +XSLdir = $(datadir)/pygobject/xsl +XSL_DATA = $(XSL_FILES) $(FIXXREF) EXTRA_DIST = \ $(HTML_FILES) \ @@ -74,6 +82,13 @@ EXTRA_DIST = \ reference/builddate.xml: @$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@ + +if ENABLE_DOCS + +BUILT_SOURCES = reference/builddate.xml $(HTML_FILES) +DISTCLEANFILES = reference/builddate.xml $(HTML_FILES) + + # Do not add a builddate.xml dependency here, because the generated html # documentation will be included in the tarball so xsltproc is not needed to # install the documentation. Adding a builddate.xml dependency will force @@ -91,3 +106,4 @@ $(HTML_FILES): $(XML_FILES) $(XSL_FILES) # reference/pygobject-ref.xml # pdfxmltex pygobject-ref.fo >output </dev/null +endif |