[cairo-commit] cairo/src Makefile.am,1.68,1.69

[Vladimir Vukicevic]

Committed by: vladimir

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv16497/src

Modified Files:
	Makefile.am 
Log Message:
2005-12-12  Vladimir Vukicevic  <vladimir at pobox.com>

	* configure.in: bump glitz req to 0.5.1, test for backends

	* test/cairo-test.c: Add glitz backend (original patches from
	sunmoon1997 at gmail.com), including glx, wgl, and agl support.
	Add CAIRO_TEST_TARGET environment variable for limiting backends
	to test.

	* test/make-html.pl: Takes all *.log files and spits out html
	to stdout that can be used to view all test results at once.
	


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- Makefile.am	8 Dec 2005 21:09:27 -0000	1.68
+++ Makefile.am	12 Dec 2005 19:56:40 -0000	1.69
@@ -64,12 +64,21 @@
 # Headers that declare the functions in the cairo DLL API on Windows
 cairo_win32_api_headers = \
 	$(srcdir)/cairo.h \
-	$(srcdir)/cairo-ft.h \
-	$(srcdir)/cairo-pdf.h \
-	$(srcdir)/cairo-ps.h \
 	$(srcdir)/cairo-win32.h \
 	$(srcdir)/cairo-debug.h
 
+if CAIRO_HAS_GLITZ_SURFACE
+cairo_win32_api_headers += \
+	$(srcdir)/cairo-glitz.h
+endif
+
+if CAIRO_HAS_FT_FONT
+cairo_win32_api_headers += \
+	$(srcdir)/cairo-ft.h \
+	$(srcdir)/cairo-pdf.h \
+	$(srcdir)/cairo-ps.h
+endif
+
 # These names match automake style variable definition conventions so
 # without these lines, automake will complain during the handling of 
 # the libcairo_la_LIBADD below.  (The INCLUDES is an autoconf only
@@ -170,11 +179,7 @@
 	(echo EXPORTS; \
 	cat $(cairo_win32_api_headers) | \
 	grep -v -E '^# *include' | \
-	gcc \
-	    -DCAIRO_HAS_WIN32_SURFACE \
-	    -DCAIRO_HAS_WIN32_FONT \
-	    -DCAIRO_HAS_PNG_FUNCTIONS \
-	    -E - | \
+	gcc -include cairo-features.h -E - |\
 	grep -E '^cairo_.* \(' | \
 	sed -e 's/\([^ ]*\).*/\1/' | \
 	sort; \