[cairo-commit] cairo/test Makefile.am,1.75,1.76

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv5810/test

Modified Files:
	Makefile.am 
Log Message:

2005-08-10  Carl Worth  <cworth at cworth.org>

        From Keith Packard <keithp at keithp.com>,

        Build pixman internally as a private part of cairo, with suitable
        name changes to avoid any visible pixman symbols in the cairo
        library:

        * Makefile.am: Descend into pixman.

        * cairo.pc.in: Drop libpixman from Requires.

        * configure.in: Don't check for libpixman. Check version of
        pkg-config and use Requires.private instead of Requires in
        cairo.pc if possible. Generate pixman Makefiles.

        * pixman/Makefile.am: Rip out release-publish target and
        installation of libpixman.pc.

        * pixman/src/Makefile.am: Add pixman-remap.h. Drop libpixman.la
        target.

        * pixman/src/icint.h: Fix to include config.h rather than
        ../config.h

        * pixman/src/pixman-remap.h: This is the cpp magic to rename all
        pixman functions from the various fb, Fb, INT_pixman, pixman,
        Render, _Render, or no prefix to _cairo_pixman_ prefixes.

        * pixman/src/pixman.h: Include pixman-remap.h to get all the
        cairo-internalized names.

        * src/Makefile.am:
        * test/Makefile.am: Add -Ipixman/src to get at
        pixman-remap.h.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- Makefile.am	9 Aug 2005 03:57:14 -0000	1.75
+++ Makefile.am	10 Aug 2005 19:36:51 -0000	1.76
@@ -135,6 +135,7 @@
 	-D_GNU_SOURCE				\
 	$(CAIRO_CFLAGS)				\
 	-I$(srcdir)				\
+	-I$(top_srcdir)/pixman/src		\
 	-I$(top_builddir)/src			\
 	-I$(top_srcdir)/src