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 /tests/conform | |
| 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 'tests/conform')
| -rw-r--r-- | tests/conform/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 9d6e516b..432021c6 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -113,15 +113,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_DISABLE_DEPRECATED \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ -DCOGL_COMPILATION |