Commit bf71cb2e authored by Jonas Ådahl's avatar Jonas Ådahl

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
parent 4d13f6e2
......@@ -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
......
......@@ -68,7 +68,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <glib.h>
......
......@@ -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"
......
......@@ -34,7 +34,7 @@
* group.
*/
#include "config.h"
#include "clutter-build-config.h"
#include "cally-group.h"
#include "cally-actor-private.h"
......
......@@ -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
......
......@@ -35,7 +35,7 @@
* #ClutterStageManager).
*/
#include "config.h"
#include "clutter-build-config.h"
#include "cally-root.h"
......
......@@ -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"
......
......@@ -40,7 +40,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "cally-text.h"
......
......@@ -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
......
......@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <stdlib.h>
......
......@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
......
......@@ -42,7 +42,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-action.h"
......
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <math.h>
......
......@@ -42,7 +42,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-actor-meta-private.h"
......
......@@ -605,7 +605,7 @@
* #ClutterActor:reactive property instead of this macro.
*/
#include "config.h"
#include "clutter-build-config.h"
#include <math.h>
......
......@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-align-constraint.h"
......
......@@ -46,7 +46,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
......
......@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
......
......@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-types.h"
......
......@@ -44,7 +44,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <math.h>
......
......@@ -81,7 +81,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <math.h>
......
......@@ -95,7 +95,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-binding-pool.h"
......
......@@ -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
......
......@@ -49,7 +49,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <math.h>
......
......@@ -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>
......
/* 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
......@@ -28,7 +28,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-cairo.h"
......
......@@ -43,7 +43,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <cogl/cogl.h>
......
......@@ -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"
......
......@@ -93,7 +93,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-click-action.h"
......
......@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
......
......@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <math.h>
......
......@@ -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
......
......@@ -129,7 +129,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <string.h>
......
......@@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <stdarg.h>
......
......@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-content-private.h"
......
......@@ -52,7 +52,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
......
......@@ -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
......
......@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-backend-private.h"
......
......@@ -64,7 +64,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-drag-action.h"
......
......@@ -59,7 +59,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-drop-action.h"
......
#include "config.h"
#include "clutter-build-config.h"
#include "clutter-easing.h"
......
......@@ -161,7 +161,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-effect.h"
......
/*** BEGIN file-header ***/
#include "config.h"
#include "clutter-build-config.h"
#include "clutter-enum-types.h"
/*** END file-header ***/
......
#include "config.h"
#include "clutter-build-config.h"
#include "clutter-event-translator.h"
......
......@@ -24,7 +24,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-backend-private.h"
......
......@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <stdlib.h>
......
......@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-debug.h"
......
......@@ -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"
......
......@@ -53,7 +53,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <math.h>
......
......@@ -84,7 +84,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-gesture-action-private.h"
......
......@@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include <string.h>
......
......@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-debug.h"
......
......@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
......
......@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-input-device-tool.h"
......
......@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "clutter-build-config.h"
#endif
#include "clutter-input-device.h"
......
......@@ -46,7 +46,7 @@
* #ClutterInterval is available since Clutter 1.0
*/