Merge branch 'cally-merge'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 7 Jul 2010 15:06:30 +0000 (16:06 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 7 Jul 2010 15:06:30 +0000 (16:06 +0100)
* cally-merge:
  cally: Add introspection generation
  cally: Improving cally doc
  cally: Cleaning CallyText
  cally: Refactoring "window:create" and "window:destroy" emission code
  cally: Use proper backend information on CallyActor
  cally: Check HAVE_CONFIG_H on cally-util.c
  docs: Fix Cally documentation
  cally: Clean up the headers
  Add binaries of the Cally examples to the ignore file
  docs: Add Cally API reference
  Avoid to load cally module on a11y examples
  Add accessibility tests
  Initialize accessibility support on clutter_init
  Rename some methods and includes to avoid -Wshadow warnings
  Cally initialization code
  Add Cally

1  2 
clutter/cogl/cogl/Makefile.am
configure.ac

@@@ -218,10 -218,10 +218,10 @@@ cogl_headers = 
  
  coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
  coglinclude_HEADERS = $(cogl_headers)
 -nodist_coglinclude_HEADERS = cogl-defines.h
 +nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h
  
  if HAVE_INTROSPECTION
- Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
+ Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cogl.la
        $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
                --namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \
                $(INCLUDES) \
diff --cc configure.ac
@@@ -1036,11 -1030,10 +1038,12 @@@ AC_CONFIG_FILES(
          clutter/cogl/pango/Makefile
          clutter/json/Makefile
          tests/Makefile
+         tests/accessibility/Makefile
          tests/conform/Makefile
 +        tests/conform/test-launcher.sh
          tests/data/Makefile
          tests/interactive/Makefile
 +        tests/interactive/wrapper.sh
          tests/micro-bench/Makefile
          tests/tools/Makefile
          doc/Makefile