[cogl/cogl-1.14: 168/174] build: update to build with automake 1.13
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.14: 168/174] build: update to build with automake 1.13
- Date: Tue, 22 Jan 2013 18:44:54 +0000 (UTC)
commit 50005a93647173222c2dfe3ca81812c3794f06be
Author: Robert Bragg <robert linux intel com>
Date: Thu Jan 17 22:56:41 2013 +0000
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)
autogen.sh | 2 +-
cogl-gles2/Makefile.am | 4 ++--
cogl-pango/Makefile.am | 4 ++--
cogl/Makefile.am | 8 ++++----
doc/reference/cogl-2.0-experimental/Makefile.am | 4 ++--
examples/Makefile.am | 4 ++--
tests/conform/Makefile.am | 6 +++---
tests/micro-perf/Makefile.am | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 9219f85..58f2b02 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 bbfcdde..2c78f27 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 8a59a2c..69b3c0d 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -36,7 +36,7 @@ libcogl_pango_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 \
@@ -106,7 +106,7 @@ CoglPango_1_0_gir_NAMESPACE = CoglPango
CoglPango_1_0_gir_VERSION = 1.0
CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la
CoglPango_1_0_gir_FILES = $(source_h) $(source_c)
-CoglPango_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
+CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0
CoglPango_1_0_gir_SCANNERFLAGS = \
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 37dcba5..f5e8174 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)\" \
@@ -678,7 +678,7 @@ Cogl_1_0_gir_NAMESPACE = Cogl
Cogl_1_0_gir_VERSION = 1.0
Cogl_1_0_gir_LIBS = libcogl.la
Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h
-Cogl_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API
+Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API
Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0
Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am
index 1e415cd..8839f18 100644
--- a/doc/reference/cogl-2.0-experimental/Makefile.am
+++ b/doc/reference/cogl-2.0-experimental/Makefile.am
@@ -114,10 +114,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/libcogl.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 7cadaa1..592f350 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 90d972e..e6d2675 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 236fc5f..c221dd6 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 = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]