diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2006-07-12 04:27:55 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2006-07-12 04:27:55 -0400 |
| commit | f79a9f5a5259f33284d5e63ef2ddac0be4ea7d41 (patch) | |
| tree | 2ae315cae6789de70d8d6fae129865aab76f95d2 /src | |
| parent | 973d3a3d1466830dcaa94e9fe39fa6fdf510fbbc (diff) | |
Improve backend .pc files generation:
- Add all non-pkgconfig libs to Libs.private in cairo.pc
- Make cairo-xlib-xrender.pc Require cairo-xlib.pc
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/cairo-backend.pc.in | 2 | ||||
| -rw-r--r-- | src/cairo.pc.in | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 277f81e8..f490607d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -230,7 +230,7 @@ pkgconfig_DATA = cairo.pc $(backend_pkgconfigs) DISTCLEANFILES = $(backend_pkgconfigs) EXTRA_DIST = cairo-backend.pc.in $(backend_pkgconfigs): $(top_srcdir)/configure - $(top_builddir)/config.status --recheck + cd $(top_builddir) && ./config.status --recheck $(top_builddir)/config.h: $(top_srcdir)/config.h.in cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h diff --git a/src/cairo-backend.pc.in b/src/cairo-backend.pc.in index 3988ffd9..8fc51579 100644 --- a/src/cairo-backend.pc.in +++ b/src/cairo-backend.pc.in @@ -7,6 +7,6 @@ Name: @backend_name@ Description: @Backend_Name@ backend for cairo graphics library Version: @VERSION@ -Requires: cairo @BACKEND_REQUIRES@ +Requires: @BACKEND_BASE@ @BACKEND_REQUIRES@ Libs: @BACKEND_NONPKGCONFIG_LIBS@ Cflags: -I${includedir}/cairo @BACKEND_NONPKGCONFIG_CFLAGS@ diff --git a/src/cairo.pc.in b/src/cairo.pc.in index c41c41fb..b361edf1 100644 --- a/src/cairo.pc.in +++ b/src/cairo.pc.in @@ -8,5 +8,6 @@ Description: Multi-platform 2D graphics library Version: @VERSION@ @PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@ -Libs: @FREETYPE_CONFIG_LIBS@ -L${libdir} -lcairo -Cflags: @FREETYPE_CONFIG_CFLAGS@ -I${includedir}/cairo +Libs: -L${libdir} -lcairo +Libs.private: @CAIRO_NONPKGCONFIG_LIBS@ +Cflags: -I${includedir}/cairo |