isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-25 12:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing cally.pc.in and moving include headers to previous directory

Browse Source 
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 <ebassi@linux.intel.com>
This commit is contained in:
Alejandro Piñeiro 2010-10-04 02:17:40 +02:00 committed by Emmanuele Bassi
parent d3b6dd5ec7
commit f5aeabadd5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/Makefile.am
View File

@ -51,7 +51,8 @@ BUILT_GIRSOURCES =
INTROSPECTION_GIRS = INTROSPECTION_GIRS =
# the base include path for headers # 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 # pkg-config files
pc_files = pc_files =
@ -526,7 +527,7 @@ cally_sources_private = \
$(srcdir)/cally/cally-actor-private.h \ $(srcdir)/cally/cally-actor-private.h \
$(NULL) $(NULL)
cally_includedir = $(clutter_includedir)/cally cally_includedir = $(clutter_base_includedir)/cally
cally_include_HEADERS = $(cally_sources_h) cally_include_HEADERS = $(cally_sources_h)
pc_files += cally/cally-$(CLUTTER_API_VERSION).pc pc_files += cally/cally-$(CLUTTER_API_VERSION).pc

6
clutter/cally/cally.pc.in
View File

@ -3,6 +3,12 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
apiversion=@CLUTTER_API_VERSION@
winsys=@CLUTTER_WINSYS@
soname_infix=@CLUTTER_SONAME_INFIX@
cogl_driver=@COGL_DRIVER@
requires=@CLUTTER_REQUIRES@
Name: Cally Name: Cally
Description: Clutter Accessibility Implementation Library Description: Clutter Accessibility Implementation Library
Version: @VERSION@ Version: @VERSION@