diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-01-17 22:56:41 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-01-21 17:24:33 +0000 |
| commit | 5de5569e960102afe979a5f2f0403e1defebca62 (patch) | |
| tree | ce2ff2a5c7cc3e136f1b150a48e493cedc5dc9ee /cogl-gles2 | |
| parent | 819aba153bfc208ab931be1acca4bfa0635a8b58 (diff) | |
| download | cogl-5de5569e960102afe979a5f2f0403e1defebca62.tar.gz | |
build: update to build with automake 1.13
This make autogen.sh look for automake-1.13 and also updates all
Makefile.am files to no longer use the INCLUDES variable which automake
1.13 warns is deprecated by AM_CPPFLAGS.
https://bugzilla.gnome.org/show_bug.cgi?id=690891
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Diffstat (limited to 'cogl-gles2')
| -rw-r--r-- | cogl-gles2/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am index 0a48d177..3679592f 100644 --- a/cogl-gles2/Makefile.am +++ b/cogl-gles2/Makefile.am @@ -6,12 +6,12 @@ NULL = lib_LTLIBRARIES = libcogl-gles2.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) if !USE_GLIB -INCLUDES += -I$(top_builddir)/deps/glib +AM_CPPFLAGS += -I$(top_builddir)/deps/glib endif AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) |