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 | |
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>
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | cogl-gles2/Makefile.am | 4 | ||||
-rw-r--r-- | cogl-pango/Makefile.am | 4 | ||||
-rw-r--r-- | cogl/Makefile.am | 8 | ||||
-rw-r--r-- | doc/reference/cogl2/Makefile.am | 4 | ||||
-rw-r--r-- | examples/Makefile.am | 4 | ||||
-rw-r--r-- | tests/conform/Makefile.am | 6 | ||||
-rw-r--r-- | tests/micro-perf/Makefile.am | 2 |
8 files changed, 17 insertions, 17 deletions
@@ -20,7 +20,7 @@ test $TEST_TYPE $FILE || { # https://bugzilla.gnome.org/show_bug.cgi?id=661128 touch -t 200001010000 po/cogl.pot -AUTOMAKE_VERSIONS="1.12 1.11" +AUTOMAKE_VERSIONS="1.13 1.12 1.11" for version in $AUTOMAKE_VERSIONS; do if automake-$version --version < /dev/null > /dev/null 2>&1 ; then AUTOMAKE=automake-$version 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) diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am index d17ee5cf..ff636acc 100644 --- a/cogl-pango/Makefile.am +++ b/cogl-pango/Makefile.am @@ -36,7 +36,7 @@ libcogl_pango2_la_LDFLAGS = \ -no-undefined \ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ -INCLUDES = \ +AM_CPPFLAGS = \ -DCOGL_COMPILATION \ -DG_LOG_DOMAIN=\"CoglPango\" \ -I$(top_srcdir)/cogl \ @@ -105,7 +105,7 @@ CoglPango_2_0_gir_NAMESPACE = CoglPango CoglPango_2_0_gir_VERSION = 2.0 CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libcogl2.la libcogl-pango2.la CoglPango_2_0_gir_FILES = $(source_h) $(source_c) -CoglPango_2_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) +CoglPango_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) CoglPango_2_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0 CoglPango_2_0_gir_EXPORT_PACKAGES = cogl-pango2 CoglPango_2_0_gir_SCANNERFLAGS = \ diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 75679bd0..38628104 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -15,7 +15,7 @@ DISTCLEANFILES = noinst_LTLIBRARIES = lib_LTLIBRARIES = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(srcdir)/tesselator \ @@ -26,10 +26,10 @@ INCLUDES = \ $(NULL) if !USE_GLIB - INCLUDES += -I$(top_builddir)/deps/glib + AM_CPPFLAGS += -I$(top_builddir)/deps/glib endif -AM_CPPFLAGS = \ +AM_CPPFLAGS += \ -DG_LOG_DOMAIN=\"Cogl\" \ -DCOGL_COMPILATION \ -DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \ @@ -647,7 +647,7 @@ Cogl_2_0_gir_NAMESPACE = Cogl Cogl_2_0_gir_VERSION = 2.0 Cogl_2_0_gir_LIBS = libcogl2.la Cogl_2_0_gir_FILES = $(cogl_public_h) cogl-enum-types.h -Cogl_2_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API +Cogl_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API Cogl_2_0_gir_INCLUDES = GL-1.0 GObject-2.0 Cogl_2_0_gir_EXPORT_PACKAGES = cogl2 Cogl_2_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' diff --git a/doc/reference/cogl2/Makefile.am b/doc/reference/cogl2/Makefile.am index 65f25b8f..e4556c3f 100644 --- a/doc/reference/cogl2/Makefile.am +++ b/doc/reference/cogl2/Makefile.am @@ -110,10 +110,10 @@ expand_content_files = \ # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. # Only needed if you are using gtkdoc-scangobj to dynamically query widget # signals and properties. -# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) +# e.g. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(COGL_DEP_CFLAGS) +AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(COGL_DEP_CFLAGS) GTKDOC_LIBS=$(top_builddir)/cogl/libcogl2.la $(COGL_DEP_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/examples/Makefile.am b/examples/Makefile.am index 847e4041..e7159738 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,10 +1,10 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) if !USE_GLIB -INCLUDES += -I$(top_builddir)/deps/glib +AM_CPPFLAGS += -I$(top_builddir)/deps/glib endif AM_CFLAGS = \ 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 diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am index 3b640534..ddca6103 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 = \ |