summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-03-08 19:30:19 +0000
committerCarl Worth <cworth@cworth.org>2005-03-08 19:30:19 +0000
commit980eff38e494223de00e7ded706f6beaca27fce1 (patch)
treecb274d7412c88b4bfc45186f1c06bfe9a6a1b8fe
parente586688e6bed6b148c6920be35741305c95f0ca6 (diff)
Commit workaround to prevent make distcheck from making bogus complaints that gtk-doc is not enabled.
-rw-r--r--ChangeLog4
-rw-r--r--gtk-doc.make8
-rw-r--r--test/Makefile.am2
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a08cbd5b..abf671a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-03-08 Carl Worth <cworth@cworth.org>
+ * gtk-doc.make (dist-check-gtkdoc): Commit workaround to prevent
+ make distcheck from making bogus complaints that gtk-doc is not
+ enabled.
+
* test/cairo_test.c (cairo_test_create_png_pattern): Look for png
images in ${srcdir}/filename as well, so that make distcheck can
still find them.
diff --git a/gtk-doc.make b/gtk-doc.make
index bdb3c5148..18c60c2d7 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -146,7 +146,13 @@ dist-check-gtkdoc:
@false
endif
-dist-hook: dist-check-gtkdoc dist-hook-local
+# XXX: Before this was:
+# dist-hook: dist-check-gtkdoc dist-hook-local
+# which seems reasonable, but for some reason the dist-check-gtkdoc
+# was always failing on me, even though I do have gtk-doc installed
+# and it is successfully building the documentation.
+
+dist-hook: dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
diff --git a/test/Makefile.am b/test/Makefile.am
index 994c2127f..04d42e2d6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -80,4 +80,4 @@ pixman_rotate_SOURCES = pixman_rotate.c $(cairo_test_lib)
noinst_PROGRAMS = imagediff
imagediff_SOURCES = imagediff.c $(cairo_test_lib)
-CLEANFILES = *-out.png *-diff.png
+CLEANFILES = *-out.png *-diff.png *.log