[libsoup] build: use AM_CPPFLAGS rather than INCLUDES
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] build: use AM_CPPFLAGS rather than INCLUDES
- Date: Wed, 10 Jul 2013 13:09:11 +0000 (UTC)
commit 312dbe87cc452c2f55f53068d1c5ac59ab2be94b
Author: Dan Winship <danw gnome org>
Date: Wed Jul 10 09:08:35 2013 -0400
build: use AM_CPPFLAGS rather than INCLUDES
to make automake 1.13 happy
examples/Makefile.am | 2 +-
libsoup/Makefile.am | 6 +++---
tests/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 69e5b55..1609ff2 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 c2f69ae..be35fc7 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 6fa6d1c..22c4a85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DSRCDIR=\""$(abs_srcdir)"\" \
-DBUILDDIR=\""$(builddir)"\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]