[cairo-commit] 2 commits - doc/public src/Makefile.am test/Makefile.am

[Behdad Esfahbod]

 doc/public/tmpl/cairo-status.sgml |    1 +
 src/Makefile.am                   |    7 +++----
 test/Makefile.am                  |    1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit c22ca79863a54b4293e607c8e4d515868c216842
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Feb 6 12:56:48 2009 -0500

    Don't distribute cairo-features.h (#19992)
    
    Second time I fix this bug.  Mabe we should add a test for it!

diff --git a/src/Makefile.am b/src/Makefile.am
index eb82a14..b017c17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,9 +14,6 @@ export_symbols = -export-symbols cairo.def
 cairo_def_dependency = cairo.def
 endif
 
-EXTRA_DIST           += cairo-supported-features.h
-MAINTAINERCLEANFILES += cairo-supported-features.h
-
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
 
@@ -36,9 +33,11 @@ libcairo_la_DEPENDENCIES = $(cairo_def_dependency)
 
 # Special headers
 cairoinclude_HEADERS += $(top_srcdir)/cairo-version.h
+libcairo_la_SOURCES += cairo-version.h
 nodist_cairoinclude_HEADERS = cairo-features.h
-libcairo_la_SOURCES += cairo-version.h cairo-features.h
+nodist_libcairo_la_SOURCES  = cairo-features.h
 BUILT_SOURCES  += cairo-features.h cairo-supported-features.h
+DISTCLEANFILES += cairo-features.h cairo-supported-features.h
 cairo-features.h cairo-supported-features.h:
 	cd $(top_builddir) && ./config.status src/$@
 
commit a55655a82de8dee0f171efb2f7dfb1da341ecdd6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Feb 6 12:47:38 2009 -0500

    [test] Fix "make dist"

diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index fcc17a9..16b67d2 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -70,6 +70,7 @@ code is required before or after each individual cairo function call.
 @CAIRO_STATUS_INVALID_CLUSTERS: 
 @CAIRO_STATUS_INVALID_SLANT: 
 @CAIRO_STATUS_INVALID_WEIGHT: 
+ at CAIRO_STATUS_INVALID_SIZE:
 
 <!-- ##### FUNCTION cairo_status_to_string ##### -->
 <para>
diff --git a/test/Makefile.am b/test/Makefile.am
index 0b53116..9c670ed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -977,7 +977,6 @@ REFERENCE_IMAGES = \
 	trap-clip.ps2.argb32.ref.png \
 	trap-clip.ps2.rgb24.ref.png \
 	twin.ref.png \
-	twin.pdf.ref.png \
 	twin.ps.ref.png \
 	twin.svg.ref.png \
 	unantialiased-shapes.ref.png	\