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-22 18:00:05 +0000 |
| commit | 50005a93647173222c2dfe3ca81812c3794f06be (patch) | |
| tree | b613a4e767f8e4991d9a30e58d8142639e46c113 /tests | |
| parent | ebdac3162a78aa647cd35bfbb4a7c0e25f477218 (diff) | |
| download | cogl-50005a93647173222c2dfe3ca81812c3794f06be.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>
(cherry picked from commit 5de5569e960102afe979a5f2f0403e1defebca62)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conform/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/micro-perf/Makefile.am | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 90d972ec..e6d26758 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -114,15 +114,15 @@ BUILT_SOURCES = wrappers # The include of the $(buildir)/cogl directory here is to make it so # that tests that directly include Cogl source code for whitebox # testing (such as test-bitmask) will still compile -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/cogl if !USE_GLIB -INCLUDES += -I$(top_builddir)/deps/glib +AM_CPPFLAGS += -I$(top_builddir)/deps/glib endif -test_conformance_CPPFLAGS = \ +AM_CPPFLAGS += \ -DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_DISABLE_DEPRECATED \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am index 236fc5fb..c221dd66 100644 --- a/tests/micro-perf/Makefile.am +++ b/tests/micro-perf/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) test_conformance_CPPFLAGS = \ |