diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2014-08-21 16:04:35 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2014-08-21 16:04:35 +0100 |
| commit | 30b130f169fcb3d7020ad9312402017ea9e823c7 (patch) | |
| tree | e60d9bf0da7749e21360dc98865d58e5818dd35c | |
| parent | eb6d8aeb06140e8c185789d9d8aaee5e55c1fee5 (diff) | |
| download | clutter-gtk-30b130f169fcb3d7020ad9312402017ea9e823c7.tar.gz | |
build: Drop INCLUDES directives
They have been long since deprecated by AM_CPPFLAGS and AM_CFLAGS.
| -rw-r--r-- | clutter-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am index 9a35919..c97eae0 100644 --- a/clutter-gtk/Makefile.am +++ b/clutter-gtk/Makefile.am @@ -6,9 +6,9 @@ CLEANFILES = DISTCLEANFILES = EXTRA_DIST = -INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) AM_CPPFLAGS = \ + -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \ -DG_LOG_DOMAIN=\"Clutter-Gtk\" \ -DPREFIX=\""$(prefix)"\" \ -DLIBDIR=\""$(libdir)"\" \ diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 1e800e8..345e51d 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -74,7 +74,7 @@ expand_content_files= # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) $(CLUTTER_GTK_DEPS_CFLAGS) +AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(CLUTTER_GTK_DEPS_CFLAGS) GTKDOC_LIBS=$(top_builddir)/clutter-gtk/libclutter-gtk-$(CLUTTER_GTK_API_VERSION).la $(CLUTTER_GTK_DEPS_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/examples/Makefile.am b/examples/Makefile.am index 98e8e4f..b7959fb 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -9,8 +9,11 @@ noinst_PROGRAMS = \ gtk-clutter-test-actor \ gtk-clutter-window-test -INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)/clutter-gtk - +AM_CPPFLAGS = \ + -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)/clutter-gtk \ + -DGLIB_DISABLE_DEPRECATION_WARNINGS \ + -DGDK_DISABLE_DEPRECATION_WARNINGS \ + -DCLUTTER_DISABLE_DEPRECATION_WARNINGS AM_CFLAGS = $(MAINTAINER_CFLAGS) $(CLUTTER_GTK_DEPS_CFLAGS) common_deps = \ |