isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-22 17:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: update to build with automake 1.13

Browse Source 
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)
This commit is contained in:
Robert Bragg 2013-01-17 22:56:41 +00:00
parent ebdac3162a
commit 50005a9364
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -20,7 +20,7 @@ test $TEST_TYPE $FILE || {
# https://bugzilla.gnome.org/show_bug.cgi?id=661128 # https://bugzilla.gnome.org/show_bug.cgi?id=661128
touch -t 200001010000 po/cogl.pot 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 for version in $AUTOMAKE_VERSIONS; do
if automake-$version --version < /dev/null > /dev/null 2>&1 ; then if automake-$version --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-$version AUTOMAKE=automake-$version

4
cogl-gles2/Makefile.am
View File

@ -6,12 +6,12 @@ NULL =
lib_LTLIBRARIES = libcogl-gles2.la lib_LTLIBRARIES = libcogl-gles2.la
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) -I$(top_builddir)
if !USE_GLIB if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib AM_CPPFLAGS += -I$(top_builddir)/deps/glib
endif endif
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)

4
cogl-pango/Makefile.am
View File

@ -36,7 +36,7 @@ libcogl_pango_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
INCLUDES = \ AM_CPPFLAGS = \
-DCOGL_COMPILATION \ -DCOGL_COMPILATION \
-DG_LOG_DOMAIN=\"CoglPango\" \ -DG_LOG_DOMAIN=\"CoglPango\" \
-I$(top_srcdir)/cogl \ -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_VERSION = 1.0
CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la 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_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_INCLUDES = Pango-1.0 PangoCairo-1.0
CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0 CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0
CoglPango_1_0_gir_SCANNERFLAGS = \ CoglPango_1_0_gir_SCANNERFLAGS = \

8
cogl/Makefile.am
View File

@ -15,7 +15,7 @@ DISTCLEANFILES =
noinst_LTLIBRARIES = noinst_LTLIBRARIES =
lib_LTLIBRARIES = lib_LTLIBRARIES =
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(srcdir)/tesselator \ -I$(srcdir)/tesselator \
@ -26,10 +26,10 @@ INCLUDES = \
$(NULL) $(NULL)
if !USE_GLIB if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib AM_CPPFLAGS += -I$(top_builddir)/deps/glib
endif endif
AM_CPPFLAGS = \ AM_CPPFLAGS += \
-DG_LOG_DOMAIN=\"Cogl\" \ -DG_LOG_DOMAIN=\"Cogl\" \
-DCOGL_COMPILATION \ -DCOGL_COMPILATION \
-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \ -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_VERSION = 1.0
Cogl_1_0_gir_LIBS = libcogl.la Cogl_1_0_gir_LIBS = libcogl.la
Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h 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_INCLUDES = GL-1.0 GObject-2.0
Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0 Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0
Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'

4
doc/reference/cogl-2.0-experimental/Makefile.am
View File

@ -114,10 +114,10 @@ expand_content_files = \
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
# Only needed if you are using gtkdoc-scangobj to dynamically query widget # Only needed if you are using gtkdoc-scangobj to dynamically query widget
# signals and properties. # 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) # 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) GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize. # This includes the standard gtk-doc make rules, copied by gtkdocize.

4
examples/Makefile.am
View File

@ -1,10 +1,10 @@
include $(top_srcdir)/build/autotools/Makefile.am.silent include $(top_srcdir)/build/autotools/Makefile.am.silent
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) -I$(top_srcdir)
if !USE_GLIB if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib AM_CPPFLAGS += -I$(top_builddir)/deps/glib
endif endif
AM_CFLAGS = \ AM_CFLAGS = \

6
tests/conform/Makefile.am
View File

@ -114,15 +114,15 @@ BUILT_SOURCES = wrappers
# The include of the $(buildir)/cogl directory here is to make it so # The include of the $(buildir)/cogl directory here is to make it so
# that tests that directly include Cogl source code for whitebox # that tests that directly include Cogl source code for whitebox
# testing (such as test-bitmask) will still compile # testing (such as test-bitmask) will still compile
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/cogl -I$(top_builddir)/cogl
if !USE_GLIB if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib AM_CPPFLAGS += -I$(top_builddir)/deps/glib
endif endif
test_conformance_CPPFLAGS = \ AM_CPPFLAGS += \
-DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_ENABLE_EXPERIMENTAL_API \
-DCOGL_DISABLE_DEPRECATED \ -DCOGL_DISABLE_DEPRECATED \
-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \

2
tests/micro-perf/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
NULL = NULL =
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) -I$(top_srcdir)
test_conformance_CPPFLAGS = \ test_conformance_CPPFLAGS = \