diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-05-05 22:21:51 +0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2016-07-20 14:23:48 +0800 |
| commit | bf71cb2e3cbb87e00c2543792e89bb99d7e52409 (patch) | |
| tree | 0424da7b0374a1b83ae8a5fab63693d74aa40ac4 | |
| parent | 4d13f6e2d03d4d6cac342d2b660f56df386327fb (diff) | |
| download | mutter-bf71cb2e3cbb87e00c2543792e89bb99d7e52409.tar.gz | |
Don't use config.h in clutter and cogl
In cogl use cogl-config.h and in clutter use clutter-build-config.h. We
can't use clutter-config.h in clutter because its already used and
installed.
https://bugzilla.gnome.org/show_bug.cgi?id=768976
285 files changed, 388 insertions, 288 deletions
diff --git a/clutter/.gitignore b/clutter/.gitignore index 3c9d558ef..7cfe18cc2 100644 --- a/clutter/.gitignore +++ b/clutter/.gitignore @@ -28,6 +28,7 @@ tags /clutter/*.trs /clutter-lcov.info /clutter-lcov +clutter-build-config.h !/build/autotools/introspection.m4 !/build/autotools/as-linguas.m4 !/build/autotools/as-compiler-flag.m4 diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c index 375b7db62..fe3e27433 100644 --- a/clutter/clutter/cally/cally-actor.c +++ b/clutter/clutter/cally/cally-actor.c @@ -68,7 +68,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib.h> diff --git a/clutter/clutter/cally/cally-clone.c b/clutter/clutter/cally/cally-clone.c index 9672ce32a..f1832a50d 100644 --- a/clutter/clutter/cally/cally-clone.c +++ b/clutter/clutter/cally/cally-clone.c @@ -69,7 +69,7 @@ * a11y POV should still be managed as a image (with the proper properties, * position, size, etc.). */ -#include "config.h" +#include "clutter-build-config.h" #include "cally-clone.h" #include "cally-actor-private.h" diff --git a/clutter/clutter/cally/cally-group.c b/clutter/clutter/cally/cally-group.c index fce8a75d5..5d0cce5ca 100644 --- a/clutter/clutter/cally/cally-group.c +++ b/clutter/clutter/cally/cally-group.c @@ -34,7 +34,7 @@ * group. */ -#include "config.h" +#include "clutter-build-config.h" #include "cally-group.h" #include "cally-actor-private.h" diff --git a/clutter/clutter/cally/cally-rectangle.c b/clutter/clutter/cally/cally-rectangle.c index ec792efed..e02f88683 100644 --- a/clutter/clutter/cally/cally-rectangle.c +++ b/clutter/clutter/cally/cally-rectangle.c @@ -30,7 +30,7 @@ * In particular it sets a proper role for the rectangle. */ -#include "config.h" +#include "clutter-build-config.h" #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/cally/cally-root.c b/clutter/clutter/cally/cally-root.c index aae37c6ab..2f16296bc 100644 --- a/clutter/clutter/cally/cally-root.c +++ b/clutter/clutter/cally/cally-root.c @@ -35,7 +35,7 @@ * #ClutterStageManager). */ -#include "config.h" +#include "clutter-build-config.h" #include "cally-root.h" diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c index 25bb321b5..7c100aabf 100644 --- a/clutter/clutter/cally/cally-stage.c +++ b/clutter/clutter/cally/cally-stage.c @@ -34,7 +34,7 @@ * being a canvas. Anyway, this is required for applications using * just clutter, or directly #ClutterStage */ -#include "config.h" +#include "clutter-build-config.h" #include "cally-stage.h" #include "cally-actor-private.h" diff --git a/clutter/clutter/cally/cally-text.c b/clutter/clutter/cally/cally-text.c index 734aa6a14..43523ce66 100644 --- a/clutter/clutter/cally/cally-text.c +++ b/clutter/clutter/cally/cally-text.c @@ -40,7 +40,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "cally-text.h" diff --git a/clutter/clutter/cally/cally-texture.c b/clutter/clutter/cally/cally-texture.c index 12964bd5e..e7df6190d 100644 --- a/clutter/clutter/cally/cally-texture.c +++ b/clutter/clutter/cally/cally-texture.c @@ -30,7 +30,7 @@ * * In particular it sets a proper role for the texture. */ -#include "config.h" +#include "clutter-build-config.h" #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/cally/cally-util.c b/clutter/clutter/cally/cally-util.c index ce37869d8..8ffd2071a 100644 --- a/clutter/clutter/cally/cally-util.c +++ b/clutter/clutter/cally/cally-util.c @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdlib.h> diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c index 4f23d20a4..8cee69a93 100644 --- a/clutter/clutter/cally/cally.c +++ b/clutter/clutter/cally/cally.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/clutter-action.c b/clutter/clutter/clutter-action.c index c233fd141..020b37f27 100644 --- a/clutter/clutter/clutter-action.c +++ b/clutter/clutter/clutter-action.c @@ -42,7 +42,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-action.h" diff --git a/clutter/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c index 3f3179dbd..29910668e 100644 --- a/clutter/clutter/clutter-actor-box.c +++ b/clutter/clutter/clutter-actor-box.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c index 583e81693..085f2f65d 100644 --- a/clutter/clutter/clutter-actor-meta.c +++ b/clutter/clutter/clutter-actor-meta.c @@ -42,7 +42,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-actor-meta-private.h" diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index fedcbfe09..196d1ad8a 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -605,7 +605,7 @@ * #ClutterActor:reactive property instead of this macro. */ -#include "config.h" +#include "clutter-build-config.h" #include <math.h> diff --git a/clutter/clutter/clutter-align-constraint.c b/clutter/clutter/clutter-align-constraint.c index 8c84f356b..345228a0d 100644 --- a/clutter/clutter/clutter-align-constraint.c +++ b/clutter/clutter/clutter-align-constraint.c @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-align-constraint.h" diff --git a/clutter/clutter/clutter-animatable.c b/clutter/clutter/clutter-animatable.c index 85a835dbc..ea285b82e 100644 --- a/clutter/clutter/clutter-animatable.c +++ b/clutter/clutter/clutter-animatable.c @@ -46,7 +46,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c index a827229cf..7a1b8ae1d 100644 --- a/clutter/clutter/clutter-backend.c +++ b/clutter/clutter/clutter-backend.c @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-base-types.c b/clutter/clutter/clutter-base-types.c index 53d57b29e..1705ff98e 100644 --- a/clutter/clutter/clutter-base-types.c +++ b/clutter/clutter/clutter-base-types.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-types.h" diff --git a/clutter/clutter/clutter-bin-layout.c b/clutter/clutter/clutter-bin-layout.c index 2360ee277..764f5bcf1 100644 --- a/clutter/clutter/clutter-bin-layout.c +++ b/clutter/clutter/clutter-bin-layout.c @@ -44,7 +44,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c index 53cbbba8f..93831f5c2 100644 --- a/clutter/clutter/clutter-bind-constraint.c +++ b/clutter/clutter/clutter-bind-constraint.c @@ -81,7 +81,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-binding-pool.c b/clutter/clutter/clutter-binding-pool.c index 66959c784..9c24b639e 100644 --- a/clutter/clutter/clutter-binding-pool.c +++ b/clutter/clutter/clutter-binding-pool.c @@ -95,7 +95,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-binding-pool.h" diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c index 305e1f22b..21cb3b4f3 100644 --- a/clutter/clutter/clutter-blur-effect.c +++ b/clutter/clutter/clutter-blur-effect.c @@ -38,7 +38,7 @@ #define CLUTTER_BLUR_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass)) #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c index ba4eee0dc..49c8d45d4 100644 --- a/clutter/clutter/clutter-box-layout.c +++ b/clutter/clutter/clutter-box-layout.c @@ -49,7 +49,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c index 7b03732d8..7b3839153 100644 --- a/clutter/clutter/clutter-brightness-contrast-effect.c +++ b/clutter/clutter/clutter-brightness-contrast-effect.c @@ -38,7 +38,7 @@ #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass)) #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-build-config.h.in b/clutter/clutter/clutter-build-config.h.in new file mode 100644 index 000000000..d56ba988b --- /dev/null +++ b/clutter/clutter/clutter-build-config.h.in @@ -0,0 +1,104 @@ +/* clutter/clutter-build-config.h.in. Generated from configure.ac by autoheader. */ + +/* List of Cogl drivers */ +#undef CLUTTER_DRIVERS + +/* Use Generic EGL backend */ +#undef CLUTTER_EGL_BACKEND_GENERIC + +/* Can use Cogl 2.0 API internally */ +#undef COGL_ENABLE_EXPERIMENTAL_2_0_API + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + +/* Have evdev support for input handling */ +#undef HAVE_EVDEV + +/* Whether you have gcov */ +#undef HAVE_GCOV + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Supports PangoFt2 */ +#undef HAVE_PANGO_FT2 + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XINPUT2_H + +/* Define to 1 if we have the XCOMPOSITE X extension */ +#undef HAVE_XCOMPOSITE + +/* Define to 1 if we have the XDAMAGE X extension */ +#undef HAVE_XDAMAGE + +/* Define to 1 if we have the XEXT X extension */ +#undef HAVE_XEXT + +/* Define to 1 if X Generic Extensions is available */ +#undef HAVE_XGE + +/* Define to 1 if XI2 is available */ +#undef HAVE_XINPUT_2 + +/* Define to 1 if XInput 2.2 is available */ +#undef HAVE_XINPUT_2_2 + +/* Define to use XKB extension */ +#undef HAVE_XKB + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Define to 1 if building for Linux */ +#undef OS_LINUX + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* defines how to decorate public symbols while building */ +#undef _CLUTTER_EXTERN diff --git a/clutter/clutter/clutter-cairo.c b/clutter/clutter/clutter-cairo.c index fac7c189f..b5c24b24f 100644 --- a/clutter/clutter/clutter-cairo.c +++ b/clutter/clutter/clutter-cairo.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-cairo.h" diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c index 00b8c8a1c..6c92c449e 100644 --- a/clutter/clutter/clutter-canvas.c +++ b/clutter/clutter/clutter-canvas.c @@ -43,7 +43,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <cogl/cogl.h> diff --git a/clutter/clutter/clutter-child-meta.c b/clutter/clutter/clutter-child-meta.c index aeabd2ff7..4267090f7 100644 --- a/clutter/clutter/clutter-child-meta.c +++ b/clutter/clutter/clutter-child-meta.c @@ -37,7 +37,7 @@ * #ClutterChildMeta is available since Clutter 0.8 */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-child-meta.h" diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c index cd13da423..c10eec2e5 100644 --- a/clutter/clutter/clutter-click-action.c +++ b/clutter/clutter/clutter-click-action.c @@ -93,7 +93,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-click-action.h" diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c index eb91915c3..af03a4e81 100644 --- a/clutter/clutter/clutter-clone.c +++ b/clutter/clutter/clutter-clone.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-color.c b/clutter/clutter/clutter-color.c index b8551849c..83ae40631 100644 --- a/clutter/clutter/clutter-color.c +++ b/clutter/clutter/clutter-color.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c index c6e8bf17c..960708eb9 100644 --- a/clutter/clutter/clutter-colorize-effect.c +++ b/clutter/clutter/clutter-colorize-effect.c @@ -38,7 +38,7 @@ #define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass)) #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c index 2e7eb7659..c3d3f7da4 100644 --- a/clutter/clutter/clutter-constraint.c +++ b/clutter/clutter/clutter-constraint.c @@ -129,7 +129,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-container.c b/clutter/clutter/clutter-container.c index 72d40fafe..81fe4dc2e 100644 --- a/clutter/clutter/clutter-container.c +++ b/clutter/clutter/clutter-container.c @@ -27,7 +27,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdarg.h> diff --git a/clutter/clutter/clutter-content.c b/clutter/clutter/clutter-content.c index 26d8f2672..76ca65d77 100644 --- a/clutter/clutter/clutter-content.c +++ b/clutter/clutter/clutter-content.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-content-private.h" diff --git a/clutter/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c index 925866a85..be90aad62 100644 --- a/clutter/clutter/clutter-deform-effect.c +++ b/clutter/clutter/clutter-deform-effect.c @@ -52,7 +52,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c index c5fd04b03..7e1804b74 100644 --- a/clutter/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter/clutter-desaturate-effect.c @@ -40,7 +40,7 @@ #define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass)) #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-device-manager.c b/clutter/clutter/clutter-device-manager.c index 597b0d1ad..885f9735e 100644 --- a/clutter/clutter/clutter-device-manager.c +++ b/clutter/clutter/clutter-device-manager.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-backend-private.h" diff --git a/clutter/clutter/clutter-drag-action.c b/clutter/clutter/clutter-drag-action.c index 13145221e..57dae7266 100644 --- a/clutter/clutter/clutter-drag-action.c +++ b/clutter/clutter/clutter-drag-action.c @@ -64,7 +64,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-drag-action.h" diff --git a/clutter/clutter/clutter-drop-action.c b/clutter/clutter/clutter-drop-action.c index 8aa5f262a..e778411eb 100644 --- a/clutter/clutter/clutter-drop-action.c +++ b/clutter/clutter/clutter-drop-action.c @@ -59,7 +59,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-drop-action.h" diff --git a/clutter/clutter/clutter-easing.c b/clutter/clutter/clutter-easing.c index 1ed679800..544994d46 100644 --- a/clutter/clutter/clutter-easing.c +++ b/clutter/clutter/clutter-easing.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-easing.h" diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c index 33d8f1387..06df7ffbd 100644 --- a/clutter/clutter/clutter-effect.c +++ b/clutter/clutter/clutter-effect.c @@ -161,7 +161,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-effect.h" diff --git a/clutter/clutter/clutter-enum-types.c.in b/clutter/clutter/clutter-enum-types.c.in index 39bffd4a7..de2cb26d0 100644 --- a/clutter/clutter/clutter-enum-types.c.in +++ b/clutter/clutter/clutter-enum-types.c.in @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-enum-types.h" /*** END file-header ***/ diff --git a/clutter/clutter/clutter-event-translator.c b/clutter/clutter/clutter-event-translator.c index b45549679..b98957d80 100644 --- a/clutter/clutter/clutter-event-translator.c +++ b/clutter/clutter/clutter-event-translator.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-event-translator.h" diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c index 05682fbd5..be9261091 100644 --- a/clutter/clutter/clutter-event.c +++ b/clutter/clutter/clutter-event.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-backend-private.h" diff --git a/clutter/clutter/clutter-feature.c b/clutter/clutter/clutter-feature.c index 41992a437..a2280649a 100644 --- a/clutter/clutter/clutter-feature.c +++ b/clutter/clutter/clutter-feature.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdlib.h> diff --git a/clutter/clutter/clutter-fixed-layout.c b/clutter/clutter/clutter-fixed-layout.c index 3eba559ec..7034af7cd 100644 --- a/clutter/clutter/clutter-fixed-layout.c +++ b/clutter/clutter/clutter-fixed-layout.c @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-debug.h" diff --git a/clutter/clutter/clutter-flatten-effect.c b/clutter/clutter/clutter-flatten-effect.c index 3342b04c0..d61930a4d 100644 --- a/clutter/clutter/clutter-flatten-effect.c +++ b/clutter/clutter/clutter-flatten-effect.c @@ -28,7 +28,7 @@ it only exists because that class is abstract */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-flatten-effect.h" diff --git a/clutter/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c index c32122cbf..13df8825c 100644 --- a/clutter/clutter/clutter-flow-layout.c +++ b/clutter/clutter/clutter-flow-layout.c @@ -53,7 +53,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c index 6eca26f9c..668112f81 100644 --- a/clutter/clutter/clutter-gesture-action.c +++ b/clutter/clutter/clutter-gesture-action.c @@ -84,7 +84,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-gesture-action-private.h" diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c index f7b8f9eb0..069ccb6f4 100644 --- a/clutter/clutter/clutter-grid-layout.c +++ b/clutter/clutter/clutter-grid-layout.c @@ -27,7 +27,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-id-pool.c b/clutter/clutter/clutter-id-pool.c index bd224f3e7..a56543650 100644 --- a/clutter/clutter/clutter-id-pool.c +++ b/clutter/clutter/clutter-id-pool.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-debug.h" diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c index f944ec43a..722b0375d 100644 --- a/clutter/clutter/clutter-image.c +++ b/clutter/clutter/clutter-image.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-input-device-tool.c b/clutter/clutter/clutter-input-device-tool.c index 547801ead..11c72ad2b 100644 --- a/clutter/clutter/clutter-input-device-tool.c +++ b/clutter/clutter/clutter-input-device-tool.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-input-device-tool.h" diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c index 216644af0..7f9c6f7e8 100644 --- a/clutter/clutter/clutter-input-device.c +++ b/clutter/clutter/clutter-input-device.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-input-device.h" diff --git a/clutter/clutter/clutter-interval.c b/clutter/clutter/clutter-interval.c index 782f82655..270864bad 100644 --- a/clutter/clutter/clutter-interval.c +++ b/clutter/clutter/clutter-interval.c @@ -46,7 +46,7 @@ * #ClutterInterval is available since Clutter 1.0 */ -#include "config.h" +#include "clutter-build-config.h" #include <stdlib.h> #include <string.h> diff --git a/clutter/clutter/clutter-keyframe-transition.c b/clutter/clutter/clutter-keyframe-transition.c index 54b670b73..0142414c4 100644 --- a/clutter/clutter/clutter-keyframe-transition.c +++ b/clutter/clutter/clutter-keyframe-transition.c @@ -63,7 +63,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-keyframe-transition.h" diff --git a/clutter/clutter/clutter-keysyms-table.c b/clutter/clutter/clutter-keysyms-table.c index 310d103b1..47931f0b2 100644 --- a/clutter/clutter/clutter-keysyms-table.c +++ b/clutter/clutter/clutter-keysyms-table.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "clutter-build-config.h" #include <glib.h> diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c index 3b731c928..069d9af43 100644 --- a/clutter/clutter/clutter-layout-manager.c +++ b/clutter/clutter/clutter-layout-manager.c @@ -130,7 +130,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/clutter-layout-meta.c b/clutter/clutter/clutter-layout-meta.c index af106244e..971079e4a 100644 --- a/clutter/clutter/clutter-layout-meta.c +++ b/clutter/clutter/clutter-layout-meta.c @@ -35,7 +35,7 @@ * #ClutterLayoutMeta is available since Clutter 1.2 */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-layout-meta.h" diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c index 3b862dd50..9e51bbb42 100644 --- a/clutter/clutter/clutter-main.c +++ b/clutter/clutter/clutter-main.c @@ -48,7 +48,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdlib.h> diff --git a/clutter/clutter/clutter-master-clock-default.c b/clutter/clutter/clutter-master-clock-default.c index d854d0127..7b2df0df3 100644 --- a/clutter/clutter/clutter-master-clock-default.c +++ b/clutter/clutter/clutter-master-clock-default.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-master-clock.h" diff --git a/clutter/clutter/clutter-master-clock.c b/clutter/clutter/clutter-master-clock.c index df769326d..379df3a5e 100644 --- a/clutter/clutter/clutter-master-clock.c +++ b/clutter/clutter/clutter-master-clock.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-master-clock.h" diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c index 741242c45..2b57bc185 100644 --- a/clutter/clutter/clutter-offscreen-effect.c +++ b/clutter/clutter/clutter-offscreen-effect.c @@ -63,7 +63,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-page-turn-effect.c b/clutter/clutter/clutter-page-turn-effect.c index ec42f89c8..4146b1328 100644 --- a/clutter/clutter/clutter-page-turn-effect.c +++ b/clutter/clutter/clutter-page-turn-effect.c @@ -36,7 +36,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c index 1e5a3b71f..5ebfb6be2 100644 --- a/clutter/clutter/clutter-paint-node.c +++ b/clutter/clutter/clutter-paint-node.c @@ -59,7 +59,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c index 4823138cd..44e77274d 100644 --- a/clutter/clutter/clutter-paint-nodes.c +++ b/clutter/clutter/clutter-paint-nodes.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c index 184e18663..b48f7f9d6 100644 --- a/clutter/clutter/clutter-paint-volume.c +++ b/clutter/clutter/clutter-paint-volume.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-pan-action.c b/clutter/clutter/clutter-pan-action.c index f2d1e182a..582a7d72b 100644 --- a/clutter/clutter/clutter-pan-action.c +++ b/clutter/clutter/clutter-pan-action.c @@ -54,7 +54,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-pan-action.h" diff --git a/clutter/clutter/clutter-path-constraint.c b/clutter/clutter/clutter-path-constraint.c index 20b6789ba..fc9720b70 100644 --- a/clutter/clutter/clutter-path-constraint.c +++ b/clutter/clutter/clutter-path-constraint.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-path-constraint.h" diff --git a/clutter/clutter/clutter-path.c b/clutter/clutter/clutter-path.c index 0ff7a2182..5f8763aa9 100644 --- a/clutter/clutter/clutter-path.c +++ b/clutter/clutter/clutter-path.c @@ -62,7 +62,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-property-transition.c b/clutter/clutter/clutter-property-transition.c index 6cdceb2da..2b98cb1fa 100644 --- a/clutter/clutter/clutter-property-transition.c +++ b/clutter/clutter/clutter-property-transition.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-property-transition.h" diff --git a/clutter/clutter/clutter-rotate-action.c b/clutter/clutter/clutter-rotate-action.c index 7286c2b08..b1c28db7d 100644 --- a/clutter/clutter/clutter-rotate-action.c +++ b/clutter/clutter/clutter-rotate-action.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-script-parser.c b/clutter/clutter/clutter-script-parser.c index 161103734..5b7dcd8f4 100644 --- a/clutter/clutter/clutter-script-parser.c +++ b/clutter/clutter/clutter-script-parser.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c index cd58e9dad..9ca5fbb72 100644 --- a/clutter/clutter/clutter-script.c +++ b/clutter/clutter/clutter-script.c @@ -221,7 +221,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdlib.h> diff --git a/clutter/clutter/clutter-scriptable.c b/clutter/clutter/clutter-scriptable.c index e4ffdc486..5b5096e23 100644 --- a/clutter/clutter/clutter-scriptable.c +++ b/clutter/clutter/clutter-scriptable.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-scroll-actor.c b/clutter/clutter/clutter-scroll-actor.c index 49f73279b..941f64305 100644 --- a/clutter/clutter/clutter-scroll-actor.c +++ b/clutter/clutter/clutter-scroll-actor.c @@ -43,7 +43,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-scroll-actor.h" diff --git a/clutter/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c index 068914dcf..bfe68a5b9 100644 --- a/clutter/clutter/clutter-settings.c +++ b/clutter/clutter/clutter-settings.c @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-settings.h" diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c index a5169782f..c6ec49f1b 100644 --- a/clutter/clutter/clutter-shader-effect.c +++ b/clutter/clutter/clutter-shader-effect.c @@ -112,7 +112,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif /* XXX: This file depends on the cogl_program_ api with has been diff --git a/clutter/clutter/clutter-shader-types.c b/clutter/clutter/clutter-shader-types.c index 5b9fcdc1c..c956ef3f8 100644 --- a/clutter/clutter/clutter-shader-types.c +++ b/clutter/clutter/clutter-shader-types.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/clutter-snap-constraint.c b/clutter/clutter/clutter-snap-constraint.c index b4c558fd0..5b6db9b54 100644 --- a/clutter/clutter/clutter-snap-constraint.c +++ b/clutter/clutter/clutter-snap-constraint.c @@ -36,7 +36,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c index e7436538e..3a44c8209 100644 --- a/clutter/clutter/clutter-stage-manager.c +++ b/clutter/clutter/clutter-stage-manager.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-stage-manager-private.h" diff --git a/clutter/clutter/clutter-stage-window.c b/clutter/clutter/clutter-stage-window.c index 450d264a1..197bf6cb2 100644 --- a/clutter/clutter/clutter-stage-window.c +++ b/clutter/clutter/clutter-stage-window.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index e81a245b4..aa34240b9 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -43,7 +43,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-swipe-action.c b/clutter/clutter/clutter-swipe-action.c index f0f8dbdfd..554f360fc 100644 --- a/clutter/clutter/clutter-swipe-action.c +++ b/clutter/clutter/clutter-swipe-action.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-swipe-action.h" diff --git a/clutter/clutter/clutter-tap-action.c b/clutter/clutter/clutter-tap-action.c index 4d30eb129..ae9f69da7 100644 --- a/clutter/clutter/clutter-tap-action.c +++ b/clutter/clutter/clutter-tap-action.c @@ -54,7 +54,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-tap-action.h" diff --git a/clutter/clutter/clutter-test-utils.c b/clutter/clutter/clutter-test-utils.c index 077f815f7..edc413e96 100644 --- a/clutter/clutter/clutter-test-utils.c +++ b/clutter/clutter/clutter-test-utils.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-test-utils.h" diff --git a/clutter/clutter/clutter-text-buffer.c b/clutter/clutter/clutter-text-buffer.c index 63cab2206..5aaee3619 100644 --- a/clutter/clutter/clutter-text-buffer.c +++ b/clutter/clutter/clutter-text-buffer.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-text-buffer.h" diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c index 54dfae985..b57b3c535 100644 --- a/clutter/clutter/clutter-text.c +++ b/clutter/clutter/clutter-text.c @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c index 612379fc3..d3db94764 100644 --- a/clutter/clutter/clutter-timeline.c +++ b/clutter/clutter/clutter-timeline.c @@ -94,7 +94,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-timeline.h" diff --git a/clutter/clutter/clutter-transition-group.c b/clutter/clutter/clutter-transition-group.c index f479dc44c..00635644d 100644 --- a/clutter/clutter/clutter-transition-group.c +++ b/clutter/clutter/clutter-transition-group.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-transition-group.h" diff --git a/clutter/clutter/clutter-transition.c b/clutter/clutter/clutter-transition.c index 03f91d0af..83e967739 100644 --- a/clutter/clutter/clutter-transition.c +++ b/clutter/clutter/clutter-transition.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-transition.h" diff --git a/clutter/clutter/clutter-units.c b/clutter/clutter/clutter-units.c index f49df9b99..64ac570d3 100644 --- a/clutter/clutter/clutter-units.c +++ b/clutter/clutter/clutter-units.c @@ -63,7 +63,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdlib.h> diff --git a/clutter/clutter/clutter-util.c b/clutter/clutter/clutter-util.c index 5020c2932..04c2ca16d 100644 --- a/clutter/clutter/clutter-util.c +++ b/clutter/clutter/clutter-util.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/clutter-zoom-action.c b/clutter/clutter/clutter-zoom-action.c index 4e844a95a..b60973d7d 100644 --- a/clutter/clutter/clutter-zoom-action.c +++ b/clutter/clutter/clutter-zoom-action.c @@ -47,7 +47,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c index a94e08243..37ce12791 100644 --- a/clutter/clutter/cogl/clutter-stage-cogl.c +++ b/clutter/clutter/cogl/clutter-stage-cogl.c @@ -27,7 +27,7 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/deprecated/clutter-actor-deprecated.c b/clutter/clutter/deprecated/clutter-actor-deprecated.c index e3f381305..65d98dc48 100644 --- a/clutter/clutter/deprecated/clutter-actor-deprecated.c +++ b/clutter/clutter/deprecated/clutter-actor-deprecated.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/deprecated/clutter-alpha.c b/clutter/clutter/deprecated/clutter-alpha.c index 7305acfc5..c3936da6f 100644 --- a/clutter/clutter/deprecated/clutter-alpha.c +++ b/clutter/clutter/deprecated/clutter-alpha.c @@ -96,7 +96,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-animation.c b/clutter/clutter/deprecated/clutter-animation.c index 3cca7d83f..14b9e7207 100644 --- a/clutter/clutter/deprecated/clutter-animation.c +++ b/clutter/clutter/deprecated/clutter-animation.c @@ -98,7 +98,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/deprecated/clutter-animator.c b/clutter/clutter/deprecated/clutter-animator.c index 0c388118d..8464c05f5 100644 --- a/clutter/clutter/deprecated/clutter-animator.c +++ b/clutter/clutter/deprecated/clutter-animator.c @@ -116,7 +116,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/deprecated/clutter-behaviour-depth.c b/clutter/clutter/deprecated/clutter-behaviour-depth.c index 405b14bef..9282ac8ef 100644 --- a/clutter/clutter/deprecated/clutter-behaviour-depth.c +++ b/clutter/clutter/deprecated/clutter-behaviour-depth.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c index 168430cac..659b752e6 100644 --- a/clutter/clutter/deprecated/clutter-behaviour-ellipse.c +++ b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c @@ -44,7 +44,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/clutter/deprecated/clutter-behaviour-opacity.c index 385506754..26fb47fa3 100644 --- a/clutter/clutter/deprecated/clutter-behaviour-opacity.c +++ b/clutter/clutter/deprecated/clutter-behaviour-opacity.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-behaviour-path.c b/clutter/clutter/deprecated/clutter-behaviour-path.c index 929500c55..81064fa53 100644 --- a/clutter/clutter/deprecated/clutter-behaviour-path.c +++ b/clutter/clutter/deprecated/clutter-behaviour-path.c @@ -64,7 +64,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-behaviour-rotate.c b/clutter/clutter/deprecated/clutter-behaviour-rotate.c index 67ab3e441..7096e83b6 100644 --- a/clutter/clutter/deprecated/clutter-behaviour-rotate.c +++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.c @@ -36,7 +36,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-behaviour-scale.c b/clutter/clutter/deprecated/clutter-behaviour-scale.c index c0d5fcf03..82976fd99 100644 --- a/clutter/clutter/deprecated/clutter-behaviour-scale.c +++ b/clutter/clutter/deprecated/clutter-behaviour-scale.c @@ -36,7 +36,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-behaviour.c b/clutter/clutter/deprecated/clutter-behaviour.c index fe85d6118..11f950788 100644 --- a/clutter/clutter/deprecated/clutter-behaviour.c +++ b/clutter/clutter/deprecated/clutter-behaviour.c @@ -71,7 +71,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-box.c b/clutter/clutter/deprecated/clutter-box.c index 645163a44..74780e8f8 100644 --- a/clutter/clutter/deprecated/clutter-box.c +++ b/clutter/clutter/deprecated/clutter-box.c @@ -70,7 +70,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/deprecated/clutter-cairo-texture.c b/clutter/clutter/deprecated/clutter-cairo-texture.c index c69149c81..6de16d411 100644 --- a/clutter/clutter/deprecated/clutter-cairo-texture.c +++ b/clutter/clutter/deprecated/clutter-cairo-texture.c @@ -58,7 +58,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-fixed.c b/clutter/clutter/deprecated/clutter-fixed.c index cb68d1644..8a255bd75 100644 --- a/clutter/clutter/deprecated/clutter-fixed.c +++ b/clutter/clutter/deprecated/clutter-fixed.c @@ -26,7 +26,7 @@ #define G_IMPLEMENT_INLINES #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-frame-source.c b/clutter/clutter/deprecated/clutter-frame-source.c index bd9583dac..5bff6089a 100644 --- a/clutter/clutter/deprecated/clutter-frame-source.c +++ b/clutter/clutter/deprecated/clutter-frame-source.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-group.c b/clutter/clutter/deprecated/clutter-group.c index 90b3504f4..050cdfa4d 100644 --- a/clutter/clutter/deprecated/clutter-group.c +++ b/clutter/clutter/deprecated/clutter-group.c @@ -48,7 +48,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdarg.h> diff --git a/clutter/clutter/deprecated/clutter-input-device-deprecated.c b/clutter/clutter/deprecated/clutter-input-device-deprecated.c index 1a65eccb4..3b9e6978d 100644 --- a/clutter/clutter/deprecated/clutter-input-device-deprecated.c +++ b/clutter/clutter/deprecated/clutter-input-device-deprecated.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib-object.h> diff --git a/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c b/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c index 20ce96412..94f0e350b 100644 --- a/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c +++ b/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-layout-manager.h" diff --git a/clutter/clutter/deprecated/clutter-list-model.c b/clutter/clutter/deprecated/clutter-list-model.c index d717bf257..2072a258c 100644 --- a/clutter/clutter/deprecated/clutter-list-model.c +++ b/clutter/clutter/deprecated/clutter-list-model.c @@ -41,7 +41,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <stdlib.h> diff --git a/clutter/clutter/deprecated/clutter-media.c b/clutter/clutter/deprecated/clutter-media.c index c43b83263..7336a78fd 100644 --- a/clutter/clutter/deprecated/clutter-media.c +++ b/clutter/clutter/deprecated/clutter-media.c @@ -40,7 +40,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-model.c b/clutter/clutter/deprecated/clutter-model.c index eb2f82a78..5cd8c0709 100644 --- a/clutter/clutter/deprecated/clutter-model.c +++ b/clutter/clutter/deprecated/clutter-model.c @@ -154,7 +154,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/deprecated/clutter-rectangle.c b/clutter/clutter/deprecated/clutter-rectangle.c index 6bc27b236..e4cfeb48a 100644 --- a/clutter/clutter/deprecated/clutter-rectangle.c +++ b/clutter/clutter/deprecated/clutter-rectangle.c @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-score.c b/clutter/clutter/deprecated/clutter-score.c index bae728598..a37dd3d8d 100644 --- a/clutter/clutter/deprecated/clutter-score.c +++ b/clutter/clutter/deprecated/clutter-score.c @@ -80,7 +80,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-shader.c b/clutter/clutter/deprecated/clutter-shader.c index d9b086036..629595e5e 100644 --- a/clutter/clutter/deprecated/clutter-shader.c +++ b/clutter/clutter/deprecated/clutter-shader.c @@ -42,7 +42,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/deprecated/clutter-state.c b/clutter/clutter/deprecated/clutter-state.c index 2f919a1d7..5a83a82a5 100644 --- a/clutter/clutter/deprecated/clutter-state.c +++ b/clutter/clutter/deprecated/clutter-state.c @@ -179,7 +179,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <gobject/gvaluecollector.h> diff --git a/clutter/clutter/deprecated/clutter-table-layout.c b/clutter/clutter/deprecated/clutter-table-layout.c index 51944d03d..f8b1b875d 100644 --- a/clutter/clutter/deprecated/clutter-table-layout.c +++ b/clutter/clutter/deprecated/clutter-table-layout.c @@ -73,7 +73,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c index f97050200..dd0e9b015 100644 --- a/clutter/clutter/deprecated/clutter-texture.c +++ b/clutter/clutter/deprecated/clutter-texture.c @@ -44,7 +44,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif /* sadly, we are still using ClutterShader internally */ diff --git a/clutter/clutter/deprecated/clutter-timeout-interval.c b/clutter/clutter/deprecated/clutter-timeout-interval.c index 52ee18029..bb9f141cc 100644 --- a/clutter/clutter/deprecated/clutter-timeout-interval.c +++ b/clutter/clutter/deprecated/clutter-timeout-interval.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/deprecated/clutter-timeout-pool.c b/clutter/clutter/deprecated/clutter-timeout-pool.c index a220a3a61..21b3543da 100644 --- a/clutter/clutter/deprecated/clutter-timeout-pool.c +++ b/clutter/clutter/deprecated/clutter-timeout-pool.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_DISABLE_DEPRECATION_WARNINGS diff --git a/clutter/clutter/egl/clutter-backend-eglnative.c b/clutter/clutter/egl/clutter-backend-eglnative.c index fe2a2cde0..808e46aee 100644 --- a/clutter/clutter/egl/clutter-backend-eglnative.c +++ b/clutter/clutter/egl/clutter-backend-eglnative.c @@ -26,7 +26,7 @@ * Neil Roberts */ -#include "config.h" +#include "clutter-build-config.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/clutter/clutter/egl/clutter-stage-eglnative.c b/clutter/clutter/egl/clutter-stage-eglnative.c index d7484bb96..c2b179ddb 100644 --- a/clutter/clutter/egl/clutter-stage-eglnative.c +++ b/clutter/clutter/egl/clutter-stage-eglnative.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <glib.h> diff --git a/clutter/clutter/egl/clutter-stage-eglnative.h b/clutter/clutter/egl/clutter-stage-eglnative.h index cc64390bc..a237ffa77 100644 --- a/clutter/clutter/egl/clutter-stage-eglnative.h +++ b/clutter/clutter/egl/clutter-stage-eglnative.h @@ -25,10 +25,6 @@ #ifndef __CLUTTER_STAGE_EGL_NATIVE_H__ #define __CLUTTER_STAGE_EGL_NATIVE_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glib-object.h> #include <clutter/clutter-stage.h> diff --git a/clutter/clutter/evdev/clutter-device-manager-evdev.c b/clutter/clutter/evdev/clutter-device-manager-evdev.c index 2ffceb9b2..9877da256 100644 --- a/clutter/clutter/evdev/clutter-device-manager-evdev.c +++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <math.h> diff --git a/clutter/clutter/evdev/clutter-event-evdev.c b/clutter/clutter/evdev/clutter-event-evdev.c index c80a642f3..737859dd4 100644 --- a/clutter/clutter/evdev/clutter-event-evdev.c +++ b/clutter/clutter/evdev/clutter-event-evdev.c @@ -20,7 +20,7 @@ * Carlos Garnacho <carlosg@gnome.org> */ -#include "config.h" +#include "clutter-build-config.h" #include "clutter/clutter-device-manager-private.h" #include "clutter/clutter-event-private.h" diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c index e4182d1ee..44b3ee85e 100644 --- a/clutter/clutter/evdev/clutter-input-device-evdev.c +++ b/clutter/clutter/evdev/clutter-input-device-evdev.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter/clutter-device-manager-private.h" diff --git a/clutter/clutter/evdev/clutter-input-device-tool-evdev.c b/clutter/clutter/evdev/clutter-input-device-tool-evdev.c index 8269ecf70..f36fa9205 100644 --- a/clutter/clutter/evdev/clutter-input-device-tool-evdev.c +++ b/clutter/clutter/evdev/clutter-input-device-tool-evdev.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include "clutter-input-device-tool-evdev.h" diff --git a/clutter/clutter/wayland/clutter-wayland-surface.c b/clutter/clutter/wayland/clutter-wayland-surface.c index 9ee40359a..2465a1814 100644 --- a/clutter/clutter/wayland/clutter-wayland-surface.c +++ b/clutter/clutter/wayland/clutter-wayland-surface.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c index 281473e0c..4a299cf3f 100644 --- a/clutter/clutter/x11/clutter-backend-x11.c +++ b/clutter/clutter/x11/clutter-backend-x11.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #include <string.h> diff --git a/clutter/clutter/x11/clutter-device-manager-core-x11.c b/clutter/clutter/x11/clutter-device-manager-core-x11.c index f47e3b888..497b40bb0 100644 --- a/clutter/clutter/x11/clutter-device-manager-core-x11.c +++ b/clutter/clutter/x11/clutter-device-manager-core-x11.c @@ -21,7 +21,7 @@ * Author: Emmanuele Bassi <ebassi@linux.intel.com> */ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-device-manager-core-x11.h" diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c index ac513f235..ca17db139 100644 --- a/clutter/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/clutter/x11/clutter-device-manager-xi2.c @@ -21,7 +21,7 @@ * Author: Emmanuele Bassi <ebassi@linux.intel.com> */ -#include "config.h" +#include "clutter-build-config.h" #include <stdint.h> diff --git a/clutter/clutter/x11/clutter-event-x11.c b/clutter/clutter/x11/clutter-event-x11.c index 3305063c3..3636ff344 100644 --- a/clutter/clutter/x11/clutter-event-x11.c +++ b/clutter/clutter/x11/clutter-event-x11.c @@ -24,7 +24,7 @@ * Emmanuele Bassi <ebassi@linux.intel.com> */ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-backend-x11.h" #include "clutter-x11.h" diff --git a/clutter/clutter/x11/clutter-glx-texture-pixmap.c b/clutter/clutter/x11/clutter-glx-texture-pixmap.c index 33166df4b..1fdd9e4c2 100644 --- a/clutter/clutter/x11/clutter-glx-texture-pixmap.c +++ b/clutter/clutter/x11/clutter-glx-texture-pixmap.c @@ -45,7 +45,7 @@ * may use the extension if it is possible. */ -#include "config.h" +#include "clutter-build-config.h" #include <string.h> diff --git a/clutter/clutter/x11/clutter-input-device-core-x11.c b/clutter/clutter/x11/clutter-input-device-core-x11.c index c7eda97cf..c7543f9bc 100644 --- a/clutter/clutter/x11/clutter-input-device-core-x11.c +++ b/clutter/clutter/x11/clutter-input-device-core-x11.c @@ -21,7 +21,7 @@ * Author: Emmanuele Bassi <ebassi@linux.intel.com> */ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-input-device-core-x11.h" diff --git a/clutter/clutter/x11/clutter-input-device-xi2.c b/clutter/clutter/x11/clutter-input-device-xi2.c index 9490c521e..00416a33c 100644 --- a/clutter/clutter/x11/clutter-input-device-xi2.c +++ b/clutter/clutter/x11/clutter-input-device-xi2.c @@ -21,7 +21,7 @@ * Author: Emmanuele Bassi <ebassi@linux.intel.com> */ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-input-device-xi2.h" diff --git a/clutter/clutter/x11/clutter-keymap-x11.c b/clutter/clutter/x11/clutter-keymap-x11.c index 2e9bae423..914e31434 100644 --- a/clutter/clutter/x11/clutter-keymap-x11.c +++ b/clutter/clutter/x11/clutter-keymap-x11.c @@ -21,7 +21,7 @@ * Author: Emmanuele Bassi <ebassi@linux.intel.com> */ -#include "config.h" +#include "clutter-build-config.h" #include "clutter-keymap-x11.h" #include "clutter-backend-x11.h" diff --git a/clutter/clutter/x11/clutter-stage-x11.c b/clutter/clutter/x11/clutter-stage-x11.c index 84a6ab7dc..d19241e3d 100644 --- a/clutter/clutter/x11/clutter-stage-x11.c +++ b/clutter/clutter/x11/clutter-stage-x11.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "clutter-build-config.h" #include <math.h> #include <stdlib.h> diff --git a/clutter/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/clutter/x11/clutter-x11-texture-pixmap.c index 1fe92f385..7c1152f06 100644 --- a/clutter/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/clutter/x11/clutter-x11-texture-pixmap.c @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "clutter-build-config.h" #endif #define CLUTTER_ENABLE_EXPERIMENTAL_API diff --git a/clutter/clutter/x11/xsettings/xsettings-client.c b/clutter/clutter/x11/xsettings/xsettings-client.c index 753e46105..494d57584 100644 --- a/clutter/clutter/x11/xsettings/xsettings-client.c +++ b/clutter/clutter/x11/xsettings/xsettings-client.c @@ -20,7 +20,7 @@ * * Author: Owen Taylor, Red Hat, Inc. */ -#include "config.h" +#include "clutter-build-config.h" #include <limits.h> #include <stdio.h> #include <stdlib.h> diff --git a/clutter/clutter/x11/xsettings/xsettings-common.c b/clutter/clutter/x11/xsettings/xsettings-common.c index 1831324fa..8a9bcc07d 100644 --- a/clutter/clutter/x11/xsettings/xsettings-common.c +++ b/clutter/clutter/x11/xsettings/xsettings-common.c @@ -20,7 +20,7 @@ * * Author: Owen Taylor, Red Hat, Inc. */ -#include "config.h" +#include "clutter-build-config.h" #include "string.h" #include "stdlib.h" diff --git a/clutter/configure.ac b/clutter/configure.ac index e54b16044..d24d3b85e 100644 --- a/clutter/configure.ac +++ b/clutter/configure.ac @@ -54,7 +54,7 @@ AC_INIT([clutter], [http://www.clutter-project.org]) AC_CONFIG_SRCDIR([clutter/clutter.h]) -AC_CONFIG_HEADERS([clutter/config.h]) +AC_CONFIG_HEADERS([clutter/clutter-build-config.h]) AC_CONFIG_AUX_DIR([build]) AC_CONFIG_MACRO_DIR([build/autotools]) diff --git a/cogl/.gitignore b/cogl/.gitignore index 25c354b0d..3fbebd82c 100644 --- a/cogl/.gitignore +++ b/cogl/.gitignore @@ -40,9 +40,8 @@ stamp-marshal /cogl/cogl-gl-header.h /cogl-path/cogl-path-enum-types.c /cogl-path/cogl-path-enum-types.h -config.h -config.h.in -config.h.win32 +cogl-config.h +cogl-config.h.in config.log config.lt config.status diff --git a/cogl/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c index 6967ab024..e8332b95c 100644 --- a/cogl/cogl-pango/cogl-pango-display-list.c +++ b/cogl/cogl-pango/cogl-pango-display-list.c @@ -27,7 +27,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib.h> diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c index a9c7df065..145f3b9e8 100644 --- a/cogl/cogl-pango/cogl-pango-fontmap.c +++ b/cogl/cogl-pango/cogl-pango-fontmap.c @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif /* This is needed to get the Pango headers to export stuff needed to diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c index 093404f28..038db7d6d 100644 --- a/cogl/cogl-pango/cogl-pango-glyph-cache.c +++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c @@ -27,7 +27,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib.h> diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c index 625a8fa41..b0844876c 100644 --- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c +++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib.h> diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c index a8855eac0..d8cc71306 100644 --- a/cogl/cogl-pango/cogl-pango-render.c +++ b/cogl/cogl-pango/cogl-pango-render.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #ifndef PANGO_ENABLE_BACKEND diff --git a/cogl/cogl-path/cogl-path-enum-types.c.in b/cogl/cogl-path/cogl-path-enum-types.c.in index 54746076e..661e81ca2 100644 --- a/cogl/cogl-path/cogl-path-enum-types.c.in +++ b/cogl/cogl-path/cogl-path-enum-types.c.in @@ -1,6 +1,6 @@ /*** BEGIN file-header ***/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif /* We need to undefine this so that we will be sure to include diff --git a/cogl/cogl-path/cogl-path.c b/cogl/cogl-path/cogl-path.c index 2b4b3c683..8adf54257 100644 --- a/cogl/cogl-path/cogl-path.c +++ b/cogl/cogl-path/cogl-path.c @@ -32,7 +32,7 @@ * Robert Bragg <robert@linux.intel.com> */ -#include "config.h" +#include "cogl-config.h" #include "cogl-util.h" #include "cogl-object.h" diff --git a/cogl/cogl-path/cogl1-path.c b/cogl/cogl-path/cogl1-path.c index b2c59239e..384d6b4c8 100644 --- a/cogl/cogl-path/cogl1-path.c +++ b/cogl/cogl-path/cogl1-path.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c index 1c8b56972..97bb84a6a 100644 --- a/cogl/cogl/cogl-atlas-texture.c +++ b/cogl/cogl/cogl-atlas-texture.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c index 0fd8b7227..023dff8b1 100644 --- a/cogl/cogl/cogl-atlas.c +++ b/cogl/cogl/cogl-atlas.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-atlas.h" diff --git a/cogl/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c index 8d92d29da..dfc8e89f1 100644 --- a/cogl/cogl/cogl-attribute-buffer.c +++ b/cogl/cogl/cogl-attribute-buffer.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-object-private.h" diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c index bcfbf78c6..73fb07a15 100644 --- a/cogl/cogl/cogl-attribute.c +++ b/cogl/cogl/cogl-attribute.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c index 67168e747..9748aca0c 100644 --- a/cogl/cogl/cogl-bitmap-conversion.c +++ b/cogl/cogl/cogl-bitmap-conversion.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-private.h" diff --git a/cogl/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c index 9696de6ec..21b6fb443 100644 --- a/cogl/cogl/cogl-bitmap-pixbuf.c +++ b/cogl/cogl/cogl-bitmap-pixbuf.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c index fbeb2d1c6..b395c4296 100644 --- a/cogl/cogl/cogl-bitmap.c +++ b/cogl/cogl/cogl-bitmap.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c index 7034bc990..7ec84b596 100644 --- a/cogl/cogl/cogl-bitmask.c +++ b/cogl/cogl/cogl-bitmask.c @@ -31,7 +31,7 @@ * Neil Roberts <neil@linux.intel.com> */ -#include "config.h" +#include "cogl-config.h" #include <glib.h> #include <string.h> diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c index 5d876bfd8..659152d21 100644 --- a/cogl/cogl/cogl-blend-string.c +++ b/cogl/cogl/cogl-blend-string.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdlib.h> diff --git a/cogl/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c index a6d60efbc..af78e215a 100644 --- a/cogl/cogl/cogl-blit.c +++ b/cogl/cogl/cogl-blit.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c index bf6a97919..fb8f27b68 100644 --- a/cogl/cogl/cogl-boxed-value.c +++ b/cogl/cogl/cogl-boxed-value.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c index ede46cce6..18a6a4b21 100644 --- a/cogl/cogl/cogl-buffer.c +++ b/cogl/cogl/cogl-buffer.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdio.h> diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c index b0e5b0d1b..128b1bc85 100644 --- a/cogl/cogl/cogl-clip-stack.c +++ b/cogl/cogl/cogl-clip-stack.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-closure-list.c b/cogl/cogl/cogl-closure-list.c index eb8cadd27..a2e82e796 100644 --- a/cogl/cogl/cogl-closure-list.c +++ b/cogl/cogl/cogl-closure-list.c @@ -27,7 +27,7 @@ * */ -#include <config.h> +#include "cogl-config.h" #include <glib.h> diff --git a/cogl/cogl/cogl-color.c b/cogl/cogl/cogl-color.c index 02e501d43..0872cf159 100644 --- a/cogl/cogl/cogl-color.c +++ b/cogl/cogl/cogl-color.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-config.c b/cogl/cogl/cogl-config.c index 6c960d4b5..ea6e10673 100644 --- a/cogl/cogl/cogl-config.c +++ b/cogl/cogl/cogl-config.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c index 4b1af6106..c45c9b44b 100644 --- a/cogl/cogl/cogl-context.c +++ b/cogl/cogl/cogl-context.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-object.h" diff --git a/cogl/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c index 345406c91..1ef2fd037 100644 --- a/cogl/cogl/cogl-debug.c +++ b/cogl/cogl/cogl-debug.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdlib.h> diff --git a/cogl/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c index 5ea0aab49..8346d4c6c 100644 --- a/cogl/cogl/cogl-depth-state.c +++ b/cogl/cogl/cogl-depth-state.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c index 039e88199..81d3d8458 100644 --- a/cogl/cogl/cogl-display.c +++ b/cogl/cogl/cogl-display.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-enum-types.c.in b/cogl/cogl/cogl-enum-types.c.in index a08711ba2..6122acffc 100644 --- a/cogl/cogl/cogl-enum-types.c.in +++ b/cogl/cogl/cogl-enum-types.c.in @@ -1,6 +1,6 @@ /*** BEGIN file-header ***/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif /* We need to undefine this so that we will be sure to include diff --git a/cogl/cogl/cogl-error.c b/cogl/cogl/cogl-error.c index d83afc3a4..18e2b1a03 100644 --- a/cogl/cogl/cogl-error.c +++ b/cogl/cogl/cogl-error.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-types.h" diff --git a/cogl/cogl/cogl-euler.c b/cogl/cogl/cogl-euler.c index f877bbc6e..7af6ea057 100644 --- a/cogl/cogl/cogl-euler.c +++ b/cogl/cogl/cogl-euler.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <cogl-util.h> diff --git a/cogl/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c index 7c160c3c1..31b421bdd 100644 --- a/cogl/cogl/cogl-feature-private.c +++ b/cogl/cogl/cogl-feature-private.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c index 05c91ffd0..f1209be36 100644 --- a/cogl/cogl/cogl-fence.c +++ b/cogl/cogl/cogl-fence.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-fence.h" diff --git a/cogl/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c index 2114a64b5..0571960d3 100644 --- a/cogl/cogl/cogl-frame-info.c +++ b/cogl/cogl/cogl-frame-info.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-frame-info-private.h" diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c index 1f70d3dc2..9dbd2a17d 100644 --- a/cogl/cogl/cogl-framebuffer.c +++ b/cogl/cogl/cogl-framebuffer.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-gles2-context.c b/cogl/cogl/cogl-gles2-context.c index 33c438798..78d423f08 100644 --- a/cogl/cogl/cogl-gles2-context.c +++ b/cogl/cogl/cogl-gles2-context.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c index fea254478..b0b0ac566 100644 --- a/cogl/cogl/cogl-glib-source.c +++ b/cogl/cogl/cogl-glib-source.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-glib-source.h" diff --git a/cogl/cogl/cogl-glsl-shader.c b/cogl/cogl/cogl-glsl-shader.c index 196e0c7ae..5aadd1074 100644 --- a/cogl/cogl/cogl-glsl-shader.c +++ b/cogl/cogl/cogl-glsl-shader.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-gpu-info.c b/cogl/cogl/cogl-gpu-info.c index 54dfe18d5..845382881 100644 --- a/cogl/cogl/cogl-gpu-info.c +++ b/cogl/cogl/cogl-gpu-info.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-gtype-private.h b/cogl/cogl/cogl-gtype-private.h index 849838563..e7505264f 100644 --- a/cogl/cogl/cogl-gtype-private.h +++ b/cogl/cogl/cogl-gtype-private.h @@ -31,7 +31,7 @@ #ifndef __COGL_GTYPE_PRIVATE_H__ #define __COGL_GTYPE_PRIVATE_H__ -#include "config.h" +#include "cogl-config.h" #include <glib.h> #include <glib-object.h> diff --git a/cogl/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c index cddaf4762..1f9b59d8d 100644 --- a/cogl/cogl/cogl-index-buffer.c +++ b/cogl/cogl/cogl-index-buffer.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-object-private.h" diff --git a/cogl/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c index 22568304c..8ffcdc6f6 100644 --- a/cogl/cogl/cogl-indices.c +++ b/cogl/cogl/cogl-indices.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c index 8ffe25f97..9f11e8bc0 100644 --- a/cogl/cogl/cogl-journal.c +++ b/cogl/cogl/cogl-journal.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-list.c b/cogl/cogl/cogl-list.c index 3fbc675ae..08e6a2402 100644 --- a/cogl/cogl/cogl-list.c +++ b/cogl/cogl/cogl-list.c @@ -24,7 +24,7 @@ /* This list implementation is based on the Wayland source code */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdlib.h> diff --git a/cogl/cogl/cogl-magazine.c b/cogl/cogl/cogl-magazine.c index 56177515e..89c91226b 100644 --- a/cogl/cogl/cogl-magazine.c +++ b/cogl/cogl/cogl-magazine.c @@ -52,7 +52,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-memory-stack-private.h" diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c index 400855f60..d426e1fa3 100644 --- a/cogl/cogl/cogl-matrix-stack.c +++ b/cogl/cogl/cogl-matrix-stack.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c index fd0f6af3c..a67f0ab14 100644 --- a/cogl/cogl/cogl-matrix.c +++ b/cogl/cogl/cogl-matrix.c @@ -70,7 +70,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <cogl-util.h> diff --git a/cogl/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c index f723abc12..a7c3ee3b5 100644 --- a/cogl/cogl/cogl-memory-stack.c +++ b/cogl/cogl/cogl-memory-stack.c @@ -55,7 +55,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-memory-stack-private.h" diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c index 554aaad6e..ed1226924 100644 --- a/cogl/cogl/cogl-meta-texture.c +++ b/cogl/cogl/cogl-meta-texture.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-texture.h" diff --git a/cogl/cogl/cogl-node.c b/cogl/cogl/cogl-node.c index 60d3e7338..dcec3cca7 100644 --- a/cogl/cogl/cogl-node.c +++ b/cogl/cogl/cogl-node.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-object.c b/cogl/cogl/cogl-object.c index 452f625f9..1b849d58c 100644 --- a/cogl/cogl/cogl-object.c +++ b/cogl/cogl/cogl-object.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib.h> diff --git a/cogl/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c index 3940627c4..1adbf4128 100644 --- a/cogl/cogl/cogl-onscreen-template.c +++ b/cogl/cogl/cogl-onscreen-template.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-object.h" diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c index 4b53bb25e..e766e59d0 100644 --- a/cogl/cogl/cogl-onscreen.c +++ b/cogl/cogl/cogl-onscreen.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-output.c b/cogl/cogl/cogl-output.c index ae8560518..573e8dc9f 100644 --- a/cogl/cogl/cogl-output.c +++ b/cogl/cogl/cogl-output.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-output-private.h" diff --git a/cogl/cogl/cogl-pipeline-cache.c b/cogl/cogl/cogl-pipeline-cache.c index 0a6bb6a90..62b372406 100644 --- a/cogl/cogl/cogl-pipeline-cache.c +++ b/cogl/cogl/cogl-pipeline-cache.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <test-fixtures/test-unit.h> diff --git a/cogl/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c index beb35b34e..0e4f6cd42 100644 --- a/cogl/cogl/cogl-pipeline-debug.c +++ b/cogl/cogl/cogl-pipeline-debug.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c index 9c8e3df86..8f961b030 100644 --- a/cogl/cogl/cogl-pipeline-hash-table.c +++ b/cogl/cogl/cogl-pipeline-hash-table.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c index fb201925b..c30fae996 100644 --- a/cogl/cogl/cogl-pipeline-layer-state.c +++ b/cogl/cogl/cogl-pipeline-layer-state.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c index 37a512000..2747024c5 100644 --- a/cogl/cogl/cogl-pipeline-layer.c +++ b/cogl/cogl/cogl-pipeline-layer.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c index 59f85b3ec..18aefc790 100644 --- a/cogl/cogl/cogl-pipeline-snippet.c +++ b/cogl/cogl/cogl-pipeline-snippet.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c index 04c76f8a7..57eaf5717 100644 --- a/cogl/cogl/cogl-pipeline-state.c +++ b/cogl/cogl/cogl-pipeline-state.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c index b2fee10d4..da2d2ce7e 100644 --- a/cogl/cogl/cogl-pipeline.c +++ b/cogl/cogl/cogl-pipeline.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c index e2d6565fb..348f74a21 100644 --- a/cogl/cogl/cogl-pixel-buffer.c +++ b/cogl/cogl/cogl-pixel-buffer.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdio.h> diff --git a/cogl/cogl/cogl-point-in-poly.c b/cogl/cogl/cogl-point-in-poly.c index cf87b9334..64bbd30b5 100644 --- a/cogl/cogl/cogl-point-in-poly.c +++ b/cogl/cogl/cogl-point-in-poly.c @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c index 1ce62f67c..d0926e3d8 100644 --- a/cogl/cogl/cogl-poll.c +++ b/cogl/cogl/cogl-poll.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-poll.h" diff --git a/cogl/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c index fce97238b..ae913d1c9 100644 --- a/cogl/cogl/cogl-primitive-texture.c +++ b/cogl/cogl/cogl-primitive-texture.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-primitive-texture.h" diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c index b31a25a86..728d94f5e 100644 --- a/cogl/cogl/cogl-primitive.c +++ b/cogl/cogl/cogl-primitive.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c index bfe773588..07ef4129d 100644 --- a/cogl/cogl/cogl-primitives.c +++ b/cogl/cogl/cogl-primitives.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c index 766e271ed..d5bca6a20 100644 --- a/cogl/cogl/cogl-profile.c +++ b/cogl/cogl/cogl-profile.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #ifdef COGL_ENABLE_PROFILE diff --git a/cogl/cogl/cogl-quaternion.c b/cogl/cogl/cogl-quaternion.c index 956744322..d380cec84 100644 --- a/cogl/cogl/cogl-quaternion.c +++ b/cogl/cogl/cogl-quaternion.c @@ -40,7 +40,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <cogl-util.h> diff --git a/cogl/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c index 69368eed6..ef6b421d2 100644 --- a/cogl/cogl/cogl-rectangle-map.c +++ b/cogl/cogl/cogl-rectangle-map.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib.h> diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c index da2f41195..027216318 100644 --- a/cogl/cogl/cogl-renderer.c +++ b/cogl/cogl/cogl-renderer.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdlib.h> diff --git a/cogl/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c index e21c64c6a..1f9212010 100644 --- a/cogl/cogl/cogl-sampler-cache.c +++ b/cogl/cogl/cogl-sampler-cache.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-sampler-cache-private.h" diff --git a/cogl/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c index a3f5d6c31..c5a79402a 100644 --- a/cogl/cogl/cogl-snippet.c +++ b/cogl/cogl/cogl-snippet.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-types.h" diff --git a/cogl/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c index e7ca67830..85f8e01eb 100644 --- a/cogl/cogl/cogl-spans.c +++ b/cogl/cogl/cogl-spans.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "math.h" diff --git a/cogl/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c index 7baf95eb6..9d7abea90 100644 --- a/cogl/cogl/cogl-sub-texture.c +++ b/cogl/cogl/cogl-sub-texture.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c index e5dd2f449..558dad230 100644 --- a/cogl/cogl/cogl-swap-chain.c +++ b/cogl/cogl/cogl-swap-chain.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-object.h" diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c index e76bef697..4f586cde7 100644 --- a/cogl/cogl/cogl-texture-2d-sliced.c +++ b/cogl/cogl/cogl-texture-2d-sliced.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c index cc28cd951..447d33b30 100644 --- a/cogl/cogl/cogl-texture-2d.c +++ b/cogl/cogl/cogl-texture-2d.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-private.h" diff --git a/cogl/cogl/cogl-texture-3d.c b/cogl/cogl/cogl-texture-3d.c index 31d2941ba..5644119d7 100644 --- a/cogl/cogl/cogl-texture-3d.c +++ b/cogl/cogl/cogl-texture-3d.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-private.h" diff --git a/cogl/cogl/cogl-texture-rectangle.c b/cogl/cogl/cogl-texture-rectangle.c index da5f1f0b0..cc2e642d3 100644 --- a/cogl/cogl/cogl-texture-rectangle.c +++ b/cogl/cogl/cogl-texture-rectangle.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-private.h" diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c index d93db2276..40aaa3b3a 100644 --- a/cogl/cogl/cogl-texture.c +++ b/cogl/cogl/cogl-texture.c @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-util.h" diff --git a/cogl/cogl/cogl-util.c b/cogl/cogl/cogl-util.c index a8a650421..f26c8961a 100644 --- a/cogl/cogl/cogl-util.c +++ b/cogl/cogl/cogl-util.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h index 160c97888..3be71af8c 100644 --- a/cogl/cogl/cogl-util.h +++ b/cogl/cogl/cogl-util.h @@ -43,7 +43,7 @@ /* Double check that config.h has been included */ #if !defined (PACKAGE_NAME) && !defined (_COGL_IN_TEST_BITMASK) -#error "config.h must be included before including cogl-util.h" +#error "cogl-config.h must be included before including cogl-util.h" #endif /* When compiling with Visual Studio, symbols that represent data that diff --git a/cogl/cogl/cogl-vector.c b/cogl/cogl/cogl-vector.c index 9da94aff4..e98d01b96 100644 --- a/cogl/cogl/cogl-vector.c +++ b/cogl/cogl/cogl-vector.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <cogl-util.h> diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c index 8801c1cbf..66fe0e595 100644 --- a/cogl/cogl/cogl-xlib-renderer.c +++ b/cogl/cogl/cogl-xlib-renderer.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-xlib-renderer.h" diff --git a/cogl/cogl/cogl-xlib.c b/cogl/cogl/cogl-xlib.c index 315a1bfbc..c381035b6 100644 --- a/cogl/cogl/cogl-xlib.c +++ b/cogl/cogl/cogl-xlib.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <cogl-xlib.h> diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c index e4e780857..fc8e4616a 100644 --- a/cogl/cogl/cogl.c +++ b/cogl/cogl/cogl.c @@ -28,7 +28,7 @@ * */ -#include <config.h> +#include "cogl-config.h" #include <string.h> #include <math.h> diff --git a/cogl/cogl/deprecated/cogl-auto-texture.c b/cogl/cogl/deprecated/cogl-auto-texture.c index 87b19c566..29a5f73ef 100644 --- a/cogl/cogl/deprecated/cogl-auto-texture.c +++ b/cogl/cogl/deprecated/cogl-auto-texture.c @@ -34,7 +34,7 @@ * Robert Bragg <robert@linux.intel.com> */ -#include <config.h> +#include "cogl-config.h" #include "cogl-context-private.h" #include "cogl-texture.h" diff --git a/cogl/cogl/deprecated/cogl-clip-state.c b/cogl/cogl/deprecated/cogl-clip-state.c index 1e0ec9289..63013e8af 100644 --- a/cogl/cogl/deprecated/cogl-clip-state.c +++ b/cogl/cogl/deprecated/cogl-clip-state.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c index 4e53a949d..6c972f2bd 100644 --- a/cogl/cogl/deprecated/cogl-clutter.c +++ b/cogl/cogl/deprecated/cogl-clutter.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib.h> diff --git a/cogl/cogl/deprecated/cogl-fixed.c b/cogl/cogl/deprecated/cogl-fixed.c index bdae6cdfd..8a4c35e74 100644 --- a/cogl/cogl/deprecated/cogl-fixed.c +++ b/cogl/cogl/deprecated/cogl-fixed.c @@ -31,7 +31,7 @@ #define G_IMPLEMENT_INLINES #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <glib-object.h> diff --git a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c index 97a2a0aec..c1fb5608a 100644 --- a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c +++ b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c @@ -28,7 +28,7 @@ * */ -#include <config.h> +#include "cogl-config.h" #include "cogl-types.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c index 25f97b113..5d73eae0d 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.c +++ b/cogl/cogl/deprecated/cogl-material-compat.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <cogl-material-compat.h> diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c index 9b44d3538..fbf4f2c46 100644 --- a/cogl/cogl/deprecated/cogl-program.c +++ b/cogl/cogl/deprecated/cogl-program.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c index d4b687c96..4a2af043c 100644 --- a/cogl/cogl/deprecated/cogl-shader.c +++ b/cogl/cogl/deprecated/cogl-shader.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-shader-private.h" diff --git a/cogl/cogl/deprecated/cogl-texture-deprecated.c b/cogl/cogl/deprecated/cogl-texture-deprecated.c index d18a01377..d15114fae 100644 --- a/cogl/cogl/deprecated/cogl-texture-deprecated.c +++ b/cogl/cogl/deprecated/cogl-texture-deprecated.c @@ -28,7 +28,7 @@ * */ -#include <config.h> +#include "cogl-config.h" #include "cogl-types.h" #include "cogl-texture.h" diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer.c b/cogl/cogl/deprecated/cogl-vertex-buffer.c index b51db13bb..cf6e51ea2 100644 --- a/cogl/cogl/deprecated/cogl-vertex-buffer.c +++ b/cogl/cogl/deprecated/cogl-vertex-buffer.c @@ -96,7 +96,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <stdio.h> diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c index 34ddb5592..0599049f0 100644 --- a/cogl/cogl/driver/gl/cogl-attribute-gl.c +++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c index b8cd03f40..f3c134a9c 100644 --- a/cogl/cogl/driver/gl/cogl-buffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c index ea1ae620a..5c77e07b6 100644 --- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c +++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c index a30ccc1f8..18ba08ab9 100644 --- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c index 55b095687..b529122e4 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c index 6fdb3a127..c255bf9b6 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c index 52c2392d4..178269646 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c @@ -31,7 +31,7 @@ * Robert Bragg <robert@linux.intel.com> */ -#include "config.h" +#include "cogl-config.h" #include "cogl-debug.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c index 99f71bff1..4eb4191f0 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c index 8884ce669..3db53424b 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c index f34a012a4..eec60d303 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c index c9e6a2824..638611072 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c index 1cae68078..1193df41d 100644 --- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c +++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c @@ -32,7 +32,7 @@ * Robert Bragg <robert@linux.intel.com> */ -#include <config.h> +#include "cogl-config.h" #include <string.h> diff --git a/cogl/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c index 2e281c03b..02253415b 100644 --- a/cogl/cogl/driver/gl/cogl-texture-gl.c +++ b/cogl/cogl/driver/gl/cogl-texture-gl.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #ifdef HAVE_STRINGS_H diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c index add25740d..25e490318 100644 --- a/cogl/cogl/driver/gl/cogl-util-gl.c +++ b/cogl/cogl/driver/gl/cogl-util-gl.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-types.h" diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index 716d1dd0b..2b9a49c73 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c b/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c index 7be4a3fe4..96ab3a3af 100644 --- a/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c +++ b/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c b/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c index 956bffc84..ac7950084 100644 --- a/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c +++ b/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c index 11139667b..c76a0cf4b 100644 --- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-private.h" diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c index e94449f4a..bf63fcc16 100644 --- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c index 85412a863..34ba57f34 100644 --- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-private.h" diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop.c b/cogl/cogl/driver/nop/cogl-attribute-nop.c index 5441d5bd4..dcb689120 100644 --- a/cogl/cogl/driver/nop/cogl-attribute-nop.c +++ b/cogl/cogl/driver/nop/cogl-attribute-nop.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-types.h" diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c index 314e7e764..441dd6e1d 100644 --- a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c +++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-clip-stack.h" diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c index 53f597564..d9b1d0f1f 100644 --- a/cogl/cogl/driver/nop/cogl-driver-nop.c +++ b/cogl/cogl/driver/nop/cogl-driver-nop.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c index 819078424..2e730e418 100644 --- a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c +++ b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-framebuffer-nop-private.h" diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c index b52149831..539048a7c 100644 --- a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c +++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <string.h> diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c index 398c357d3..d03040c24 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-debug.h" diff --git a/cogl/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/cogl/winsys/cogl-winsys-egl-kms.c index 4da1f1410..271059c7d 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-kms.c +++ b/cogl/cogl/winsys/cogl-winsys-egl-kms.c @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <EGL/egl.h> diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c index 724a4d01a..454b41ebc 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c +++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include <X11/Xlib.h> diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c index a53c0c7d7..ed41196ed 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl.c +++ b/cogl/cogl/winsys/cogl-winsys-egl.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-i18n-private.h" diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c index f88ee37b5..c50db3a04 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx.c +++ b/cogl/cogl/winsys/cogl-winsys-glx.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-i18n-private.h" diff --git a/cogl/cogl/winsys/cogl-winsys-stub.c b/cogl/cogl/winsys/cogl-winsys-stub.c index 4fc8c90e5..ba49a9419 100644 --- a/cogl/cogl/winsys/cogl-winsys-stub.c +++ b/cogl/cogl/winsys/cogl-winsys-stub.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-renderer-private.h" diff --git a/cogl/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c index fccb94c25..b0a7b68ca 100644 --- a/cogl/cogl/winsys/cogl-winsys.c +++ b/cogl/cogl/winsys/cogl-winsys.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "cogl-config.h" #endif #include "cogl-context-private.h" diff --git a/cogl/configure.ac b/cogl/configure.ac index 62c63ca9e..c2674fb8a 100644 --- a/cogl/configure.ac +++ b/cogl/configure.ac @@ -79,7 +79,7 @@ AC_INIT(cogl, [cogl_1_version]) AC_CONFIG_SRCDIR(cogl/cogl.h) AC_CONFIG_AUX_DIR([build]) AC_CONFIG_MACRO_DIR([build/autotools]) -AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS(cogl-config.h) AC_GNU_SOURCE dnl ================================================================ diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c index 59e3fd8c9..e920dd8f6 100644 --- a/cogl/test-fixtures/test-utils.c +++ b/cogl/test-fixtures/test-utils.c @@ -1,4 +1,4 @@ -#include <config.h> +#include "cogl-config.h" #include <stdlib.h> diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c index 9b6573d92..64fdfba01 100644 --- a/cogl/tests/conform/test-conform-main.c +++ b/cogl/tests/conform/test-conform-main.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "cogl-config.h" #include <cogl/cogl.h> diff --git a/cogl/tests/conform/test-fence.c b/cogl/tests/conform/test-fence.c index d5e3586f5..ab8dbac2f 100644 --- a/cogl/tests/conform/test-fence.c +++ b/cogl/tests/conform/test-fence.c @@ -5,7 +5,7 @@ #undef COGL_ENABLE_EXPERIMENTAL_API #include "test-utils.h" -#include "config.h" +#include "cogl-config.h" /* I'm writing this on the train after having dinner at a churrascuria. */ #define MAGIC_CHUNK_O_DATA ((void *) 0xdeadbeef) diff --git a/cogl/tests/conform/test-materials.c b/cogl/tests/conform/test-materials.c index 69c9c746f..e260683cb 100644 --- a/cogl/tests/conform/test-materials.c +++ b/cogl/tests/conform/test-materials.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "cogl-config.h" #include <clutter/clutter.h> #include <cogl/cogl.h> diff --git a/cogl/tests/conform/test-version.c b/cogl/tests/conform/test-version.c index b651165e8..1b2e2e753 100644 --- a/cogl/tests/conform/test-version.c +++ b/cogl/tests/conform/test-version.c @@ -5,7 +5,7 @@ #undef COGL_ENABLE_EXPERIMENTAL_API #include "test-utils.h" -#include "config.h" +#include "cogl-config.h" /* So we can use _COGL_STATIC_ASSERT we include the internal * cogl-util.h header. Since internal headers explicitly guard against diff --git a/cogl/tests/unit/test-unit-main.c b/cogl/tests/unit/test-unit-main.c index b1f78645e..4be6700ef 100644 --- a/cogl/tests/unit/test-unit-main.c +++ b/cogl/tests/unit/test-unit-main.c @@ -1,4 +1,4 @@ -#include <config.h> +#include "cogl-config.h" #include <gmodule.h> |