summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-07-10 09:08:35 -0400
committerDan Winship <danw@gnome.org>2013-07-10 09:08:35 -0400
commit312dbe87cc452c2f55f53068d1c5ac59ab2be94b (patch)
treec339fa7a9b1b68de0876bd5cc9c1edd2de7364d7
parente6ed20e9832dbc7290b3cfde39b1e029689e1ace (diff)
downloadlibsoup-312dbe87cc452c2f55f53068d1c5ac59ab2be94b.tar.gz
build: use AM_CPPFLAGS rather than INCLUDES
to make automake 1.13 happy
-rw-r--r--examples/Makefile.am2
-rw-r--r--libsoup/Makefile.am6
-rw-r--r--tests/Makefile.am2
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 69e5b550..1609ff24 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DSRCDIR=\""$(abs_srcdir)"\" \
-DBUILDDIR=\""$(builddir)"\" \
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index c2f69aec..be35fc77 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -8,7 +8,7 @@ if OS_WIN32
LIBWS2_32 = -lws2_32
endif
-INCLUDES = \
+AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"libsoup\" \
-DLOCALEDIR=\"$(localedir)\" \
-I$(top_srcdir) \
@@ -250,7 +250,7 @@ gi_built_soup_files = soup-enum-types.h
Soup-2.4.gir: libsoup-2.4.la
Soup_2_4_gir_INCLUDES = Gio-2.0
-Soup_2_4_gir_CFLAGS = $(INCLUDES) -DLIBSOUP_USE_UNSTABLE_REQUEST_API
+Soup_2_4_gir_CFLAGS = $(AM_CPPFLAGS) -DLIBSOUP_USE_UNSTABLE_REQUEST_API
Soup_2_4_gir_LIBS = libsoup-2.4.la
Soup_2_4_gir_EXPORT_PACKAGES = libsoup-2.4
Soup_2_4_gir_SCANNERFLAGS = --c-include "libsoup/soup.h"
@@ -275,7 +275,7 @@ SoupGNOME_2_4_gir_SCANNERFLAGS = \
--symbol-prefix=soup \
--c-include "libsoup/soup-gnome.h" \
--include-uninstalled=$(builddir)/Soup-2.4.gir
-SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
+SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6fa6d1c3..22c4a851 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DSRCDIR=\""$(abs_srcdir)"\" \
-DBUILDDIR=\""$(builddir)"\" \