[atk] build: s/INCLUDES/AM_CPPFLAGS/
- From: Alejandro Piñeiro Iglesias <apinheiro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atk] build: s/INCLUDES/AM_CPPFLAGS/
- Date: Wed, 11 Dec 2013 15:56:28 +0000 (UTC)
commit 44a3908cb60cb64f9d49ce481e0ccc0452cedd3c
Author: Colin Walters <walters verbum org>
Date: Wed Dec 11 10:50:56 2013 -0500
build: s/INCLUDES/AM_CPPFLAGS/
To silence automake deprecation warnings.
atk/Makefile.am | 8 ++++----
docs/Makefile.am | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 4c79fe4..7f008c3 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -13,7 +13,7 @@ else
no_undefined =
endif
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_DISABLE_DEPRECATED \
-DATK_DISABLE_DEPRECATED \
@@ -164,7 +164,7 @@ introspection_generated_sources = \
Atk-1.0.gir: libatk-1.0.la Makefile
Atk_1_0_gir_INCLUDES = GObject-2.0
-Atk_1_0_gir_CFLAGS = $(INCLUDES)
+Atk_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
Atk_1_0_gir_LIBS = libatk-1.0.la
Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk --warn-all --c-include "atk/atk.h"
Atk_1_0_gir_FILES = \
@@ -232,7 +232,7 @@ dist-hook: ../build/win32/vs9/atk.vcproj ../build/win32/vs10/atk.vcxproj ../buil
done >libatk.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/atk.vcprojin >$@
rm libatk.sourcefiles
-
+
../build/win32/vs10/atk.vcxproj: ../build/win32/vs10/atk.vcxprojin
for F in $(libatk_1_0_la_SOURCES); do \
case $$F in \
@@ -242,7 +242,7 @@ dist-hook: ../build/win32/vs9/atk.vcproj ../build/win32/vs10/atk.vcxproj ../buil
done >libatk.vs10.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/atk.vcxprojin >$@
rm libatk.vs10.sourcefiles
-
+
../build/win32/vs10/atk.vcxproj.filters: ../build/win32/vs10/atk.vcxproj.filtersin
for F in $(libatk_1_0_la_SOURCES); do \
case $$F in \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 11ef943..99bff8f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,7 +22,7 @@ IGNORE_HFILES = atkmarshal.h atkintl.h
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(DEP_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]