[glib-networking] build: use AM_CPPFLAGS instead of INCLUDES



commit fe2a0c1addc89a142d2b2a6471566f929682edc7
Author: Dan Winship <danw gnome org>
Date:   Sat Jul 13 16:04:35 2013 -0400

    build: use AM_CPPFLAGS instead of INCLUDES

 Makefile.decl              |    2 +-
 proxy/gnome/Makefile.am    |    2 +-
 proxy/libproxy/Makefile.am |    2 +-
 proxy/tests/Makefile.am    |    2 +-
 tls/gnutls/Makefile.am     |    2 +-
 tls/pkcs11/Makefile.am     |    2 +-
 tls/tests/Makefile.am      |    4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
index 2e654ad..5485039 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -6,7 +6,7 @@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symb
 
 giomoduledir = $(GIO_MODULE_DIR)
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"GLib-Net\"     \
        -DG_DISABLE_DEPRECATED          \
        $(GLIB_CFLAGS)                  \
diff --git a/proxy/gnome/Makefile.am b/proxy/gnome/Makefile.am
index 7ec792a..b69ae2b 100644
--- a/proxy/gnome/Makefile.am
+++ b/proxy/gnome/Makefile.am
@@ -8,7 +8,7 @@ libgiognomeproxy_la_SOURCES =           \
        gnome-proxy-module.c            \
        $(NULL)
 
-INCLUDES += $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS)
+AM_CPPFLAGS += $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS)
 
 libgiognomeproxy_la_LDFLAGS = $(module_flags)
 libgiognomeproxy_la_LIBADD =           \
diff --git a/proxy/libproxy/Makefile.am b/proxy/libproxy/Makefile.am
index 483ad1f..535b13f 100644
--- a/proxy/libproxy/Makefile.am
+++ b/proxy/libproxy/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += $(LIBPROXY_CFLAGS)
+AM_CPPFLAGS += $(LIBPROXY_CFLAGS)
 
 giomodule_LTLIBRARIES = libgiolibproxy.la
 
diff --git a/proxy/tests/Makefile.am b/proxy/tests/Makefile.am
index 9ed9454..e06d507 100644
--- a/proxy/tests/Makefile.am
+++ b/proxy/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES +=                                    \
+AM_CPPFLAGS +=                                 \
        $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS)     \
        -I$(top_srcdir)/proxy                   \
        -DSRCDIR=\""$(srcdir)"\"                \
diff --git a/tls/gnutls/Makefile.am b/tls/gnutls/Makefile.am
index c2ab465..8cb9ec0 100644
--- a/tls/gnutls/Makefile.am
+++ b/tls/gnutls/Makefile.am
@@ -47,7 +47,7 @@ libgiognutls_la_SOURCES =             \
        $(P11_SRCS)                     \
        $(NULL)
 
-INCLUDES +=                            \
+AM_CPPFLAGS +=                         \
        $(P11_CFLAGS)                   \
        $(GNUTLS_CFLAGS)                \
        $(NULL)
diff --git a/tls/pkcs11/Makefile.am b/tls/pkcs11/Makefile.am
index bda8a78..327a9e8 100644
--- a/tls/pkcs11/Makefile.am
+++ b/tls/pkcs11/Makefile.am
@@ -19,6 +19,6 @@ libgiopkcs11_la_LIBADD =                      \
        $(GLIB_LIBS)                            \
        $(NULL)
 
-INCLUDES +=                                    \
+AM_CPPFLAGS +=                                 \
        $(PKCS11_CFLAGS)                        \
        -DG_DISABLE_DEPRECATED
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 305394d..14ae9c7 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES +=                                    \
+AM_CPPFLAGS +=                                 \
        -I$(top_srcdir)/tls                     \
        -I$(top_builddir)/tls                   \
        -DSRCDIR=\""$(abs_srcdir)"\"            \
@@ -25,7 +25,7 @@ TEST_PROGS +=              \
        pkcs11-pin         \
        pkcs11-slot
 
-INCLUDES +=                    \
+AM_CPPFLAGS +=                 \
        $(PKCS11_CFLAGS)        \
        $(GNUTLS_CFLAGS)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]