[json-glib] build: Remove INCLUDES
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] build: Remove INCLUDES
- Date: Thu, 16 May 2013 22:40:07 +0000 (UTC)
commit 53431a7f034cbee724c9115783538c087dc07d31
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu May 16 23:37:05 2013 +0100
build: Remove INCLUDES
It has been replaced by AM_CPPFLAGS for a while.
doc/reference/Makefile.am | 2 +-
json-glib/Makefile.am | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index b5c6695..b160070 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -76,7 +76,7 @@ expand_content_files =
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
# needed to avoid including Makefile.am.gtest which redeclares
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index b65fdd9..64c74a6 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -10,13 +10,13 @@ DIST_SUBDIRS = tests
NULL =
-INCLUDES = -I$(top_srcdir) -I$(top_builddir)
-
AM_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DJSON_COMPILATION=1 \
-DG_LOG_DOMAIN=\"Json\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
$(JSON_DEBUG_CFLAGS) \
$(NULL)
@@ -112,7 +112,7 @@ Json_1_0_gir_NAMESPACE = Json
Json_1_0_gir_VERSION = 1.0
Json_1_0_gir_LIBS = libjson-glib-1.0.la
Json_1_0_gir_FILES = $(source_h) $(source_c)
-Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS)
+Json_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(JSON_CFLAGS)
Json_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
Json_1_0_gir_SCANNERFLAGS = --warn-all --pkg-export json-glib-1.0 --c-include "json-glib/json-glib.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]