[cairo-commit] cairo/src Makefile.am,1.59,1.60

[Carl Worth]

Committed by: cworth

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

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/src/Makefile.am,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Makefile.am	9 Aug 2005 04:02:12 -0000	1.59
+++ Makefile.am	10 Aug 2005 19:36:51 -0000	1.60
@@ -135,9 +135,9 @@
 
 libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
 
-INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS)
+INCLUDES = -I$(srcdir) -I$(top_srcdir)/pixman/src $(CAIRO_CFLAGS)
 
-libcairo_la_LIBADD = $(CAIRO_LIBS)
+libcairo_la_LIBADD = $(top_builddir)/pixman/src/libpixman.la $(CAIRO_LIBS)
 
 install-data-local:
 	@if test -f "$(DESTDIR)$(includedir)/cairo.h" || test -f "$(DESTDIR)$(includedir)/cairo-features.h" ; then \