From f5aeabadd5faf699ab04ec24d6db12297ee6ee30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= Date: Mon, 4 Oct 2010 02:17:40 +0200 Subject: [PATCH] Fixing cally.pc.in and moving include headers to previous directory After commit 8dd8fbdb some errors appear if you try work directly against cally: * cally.pc.in removed some elements. After install clutter, doing pkg-config --cflags cally-1.0 fails due missing winsys * cally headers were moved from clutter-1.0/cally to clutter-1.0/clutter/cally. Applications using it (yes I know, nobody is officially using it) would require to: * Change their include. * Add directly a dependency to cally, in order to use the cally.pc file with the correct directory include. Note: Take into account that accessibility support still works (ie: clutter_get_accessibility_enabled). This bug only prevents applications to work directly against cally (ie: create a CallyActor subclass) http://bugzilla.clutter-project.org/show_bug.cgi?id=2353 Signed-off-by: Emmanuele Bassi --- clutter/Makefile.am | 5 +++-- clutter/cally/cally.pc.in | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 9fd3ca62f..b7cefafe8 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -51,7 +51,8 @@ BUILT_GIRSOURCES = INTROSPECTION_GIRS = # the base include path for headers -clutter_includedir = $(includedir)/clutter-$(CLUTTER_API_VERSION)/clutter +clutter_base_includedir = $(includedir)/clutter-$(CLUTTER_API_VERSION) +clutter_includedir = $(clutter_base_includedir)/clutter # pkg-config files pc_files = @@ -526,7 +527,7 @@ cally_sources_private = \ $(srcdir)/cally/cally-actor-private.h \ $(NULL) -cally_includedir = $(clutter_includedir)/cally +cally_includedir = $(clutter_base_includedir)/cally cally_include_HEADERS = $(cally_sources_h) pc_files += cally/cally-$(CLUTTER_API_VERSION).pc diff --git a/clutter/cally/cally.pc.in b/clutter/cally/cally.pc.in index 16e696ce1..dbb34fa81 100644 --- a/clutter/cally/cally.pc.in +++ b/clutter/cally/cally.pc.in @@ -3,6 +3,12 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +apiversion=@CLUTTER_API_VERSION@ +winsys=@CLUTTER_WINSYS@ +soname_infix=@CLUTTER_SONAME_INFIX@ +cogl_driver=@COGL_DRIVER@ +requires=@CLUTTER_REQUIRES@ + Name: Cally Description: Clutter Accessibility Implementation Library Version: @VERSION@