[glom] Glom Python API reference: Failed attempt to dist the html files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Glom Python API reference: Failed attempt to dist the html files.
- Date: Tue, 20 Apr 2010 08:05:28 +0000 (UTC)
commit 8a4385c4b6f9bbb68827c15edd82ae26be9ef3e5
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Apr 20 10:05:19 2010 +0200
Glom Python API reference: Failed attempt to dist the html files.
* docs/pyglom_reference/Makefile.am: Copied some stuff from the mm-common
files, but it doesn't work yet.
ChangeLog | 19 +++++++++++++------
docs/pyglom_reference/Makefile.am | 12 ++++++++++--
2 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0b3c90a..9a2f4b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-20 Murray Cumming <murrayc murrayc-desktop>
+
+ Glom Python API reference: Failed attempt to dist the html files.
+
+ * docs/pyglom_reference/Makefile.am: Copied some stuff from the mm-common
+ files, but it doesn't work yet.
+
2010-04-20 Murray Cumming <murrayc murrayc com>
Glom Python API reference: Install the html generated by sphinx.
@@ -8,18 +15,18 @@
2010-04-20 Murray Cumming <murrayc murrayc com>
Solve the long-paths problem with the doxygen-generated html files.
-
- * configure.ac: Change the AM_INIT_AUTOMAKE() call to be like gtkmm,
- allowing the tarball to contain long paths - needed for the libglom html
+
+ * configure.ac: Change the AM_INIT_AUTOMAKE() call to be like gtkmm,
+ allowing the tarball to contain long paths - needed for the libglom html
documentation.
2010-04-19 Murray Cumming <murrayc murrayc com>
More improved use of sphinx.
-
- * docs/pyglom_reference/conf.py.in: Do not generate the module index page
+
+ * docs/pyglom_reference/conf.py.in: Do not generate the module index page
because we have only one module.
- * docs/pyglom_reference/index.rst.in: Add back the link to the general index,
+ * docs/pyglom_reference/index.rst.in: Add back the link to the general index,
which seems to actually be generated.
2010-04-19 Murray Cumming <murrayc murrayc com>
diff --git a/docs/pyglom_reference/Makefile.am b/docs/pyglom_reference/Makefile.am
index 1100034..5b85667 100644
--- a/docs/pyglom_reference/Makefile.am
+++ b/docs/pyglom_reference/Makefile.am
@@ -33,13 +33,14 @@ dist_reference_DATA = $(strip $(doc_inst_files))
dist_noinst_DATA = $(strip $(doc_dist_files))
#DISTCLEANFILES = $(doc_outdir)/doxygen.log
-MAINTAINERCLEANFILES = $(doc_outdir)/html/*
+MAINTAINERCLEANFILES = $(doc_outdir)/html/* outdir
html/index.html:
rm -rf html
$(SPHINX_BUILD) -b html ./ $(doc_outdir)/html/
-MAINTAINERCLEANFILES = html/* outdir
+# Explicitly depend on the files to be distributed or installed.
+all-local: $(doc_inst_files) $(doc_dist_files)
# Hook up custom rules for translating references to external documentation
# to the actual location at install time.
@@ -89,3 +90,10 @@ uninstall-htmlref:
@$(NORMAL_UNINSTALL)
(cd '$(DESTDIR)$(htmlrefdir)' 2>/dev/null || exit 0; \
find . -type f '(' $(htmlref_find_patterns) ')' -exec rm -f '{}' '+')
+
+# Define phony (non-file) targets so things don't break if anyone creates files with these names.
+.PHONY: install-htmlref uninstall-htmlref
+
+# Instruct GNU make to delete the targets of a rule after it failed, in
+# order to avoid the complication of handling that situation manually.
+.DELETE_ON_ERROR:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]