[cairo] installed api versioning

[Carl Worth]

On Fri, 12 Nov 2004 18:45:01 -0500, Ross McFarland wrote:
> this patch addresses the ability to parallel install major versions of
> cairo (actually it's configurable, could be minor, etc.) it's somewhat
> based on modified versions of glib/gtk's mechanisms.
> 
> please review, point out any problems etc. if it looks good let me know
> and i'll commit it. 

I'd like to take a less invasive approach to begin with.

Can we get away with just naming everything, (the .pc file, the
directory under include, and the library), just "cairo".

Then, down the road, when we make incompatible API changes we can just
rename all of those "cairo2"?

That seems like it simplified the patch to something like what's
below.

If nobody objects to that, then I'll commit it shortly along with the
header file splitting shortly.

-Carl

[Warning, manually edited diff follows]

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.16
diff -u -r1.16 cairo.pc.in
--- cairo.pc.in	26 Oct 2004 21:38:43 -0000	1.16
+++ cairo.pc.in	12 Nov 2004 23:14:23 -0000
@@ -8,6 +8,6 @@
 Version: @VERSION@
 
 Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
-Cflags: -I${includedir} @FREETYPE_CFLAGS@
+Cflags: -I${includedir}/cairo @FREETYPE_CFLAGS@

Index: src/Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- src/Makefile.am	26 Oct 2004 21:38:43 -0000	1.28
+++ src/Makefile.am	12 Nov 2004 23:14:24 -0000
@@ -1,5 +1,10 @@
-lib_LTLIBRARIES = libcairo.la
-include_HEADERS = cairo.h cairo-features.h
+
+cairoincludedir = $(includedir)/cairo-$(CAIRO_API_VERSION)
+
+lib_LTLIBRARIES = libcairo.la
+cairoinclude_HEADERS = cairo.h cairo-features.h
  
if CAIRO_HAS_PS_SURFACE
libcairo_ps_sources = cairo_ps_surface.c

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/cairo/attachments/20050119/95dccfec/attachment.pgp