GNOME.org
 

[libpeas] Use AM_CPPFLAGS instead of INCLUDED

commit 3dca4f330c8b734b28523137ee99cf66733d53a5
Author: Garrett Regier <garrettregier gmail com>
Date:   Mon Mar 3 13:33:04 2014 -0800

    Use AM_CPPFLAGS instead of INCLUDED
    
    INCLUDES is deprecated and AM_CPPFLAGS should be used instead.

 libpeas-gtk/Makefile.am                            |    2 +-
 libpeas/Makefile.am                                |   18 +++++++++---------
 loaders/python/Makefile.am                         |    2 +-
 loaders/python3/Makefile.am                        |    2 +-
 loaders/seed/Makefile.am                           |    2 +-
 peas-demo/Makefile.am                              |   12 ++++++------
 peas-demo/plugins/helloworld/Makefile.am           |    2 +-
 peas-demo/plugins/secondtime/Makefile.am           |    2 +-
 tests/libpeas-gtk/Makefile.am                      |    2 +-
 .../plugins/builtin-configurable/Makefile.am       |    2 +-
 tests/libpeas-gtk/plugins/configurable/Makefile.am |    2 +-
 tests/libpeas-gtk/testing/Makefile.am              |    2 +-
 tests/libpeas/Makefile.am                          |    2 +-
 tests/libpeas/introspection/Makefile.am            |    2 +-
 tests/libpeas/plugins/extension-c/Makefile.am      |    2 +-
 tests/libpeas/testing/Makefile.am                  |    2 +-
 tests/plugins/builtin/Makefile.am                  |    2 +-
 tests/plugins/has-dep/Makefile.am                  |    2 +-
 tests/plugins/loadable/Makefile.am                 |    2 +-
 tests/plugins/self-dep/Makefile.am                 |    2 +-
 tests/testing-util/Makefile.am                     |    2 +-
 21 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/libpeas-gtk/Makefile.am b/libpeas-gtk/Makefile.am
index 0ed84cd..6013011 100644
--- a/libpeas-gtk/Makefile.am
+++ b/libpeas-gtk/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libpeas-gtk-1.0.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(srcdir)                     \
        $(PEAS_CFLAGS)                  \
diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am
index de67252..9a24522 100644
--- a/libpeas/Makefile.am
+++ b/libpeas/Makefile.am
@@ -1,14 +1,14 @@
 lib_LTLIBRARIES = libpeas-1.0.la
 
-INCLUDES =                                                             \
-       -I$(top_srcdir)                                                 \
-       -I$(srcdir)                                                     \
-       $(PEAS_CFLAGS)                                                  \
-       $(IGE_MAC_CFLAGS)                                               \
-       $(GCOV_CFLAGS)                                                  \
-       $(WARN_CFLAGS)                                                  \
-       $(DISABLE_DEPRECATED)                                           \
-       -DDATADIR=\""$(datadir)"\"                                      \
+AM_CPPFLAGS =                          \
+       -I$(top_srcdir)                 \
+       -I$(srcdir)                     \
+       $(PEAS_CFLAGS)                  \
+       $(IGE_MAC_CFLAGS)               \
+       $(GCOV_CFLAGS)                  \
+       $(WARN_CFLAGS)                  \
+       $(DISABLE_DEPRECATED)           \
+       -DDATADIR=\""$(datadir)"\"      \
        -DLIBDIR=\""$(libdir)"\"
 
 libpeas_1_0_la_LDFLAGS = \
diff --git a/loaders/python/Makefile.am b/loaders/python/Makefile.am
index a33d0af..626c46e 100644
--- a/loaders/python/Makefile.am
+++ b/loaders/python/Makefile.am
@@ -2,7 +2,7 @@
 
 loaderdir = $(libdir)/libpeas-1.0/loaders
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        $(PEAS_CFLAGS)                  \
        $(GCOV_CFLAGS)                  \
diff --git a/loaders/python3/Makefile.am b/loaders/python3/Makefile.am
index 884d710..a21f06a 100644
--- a/loaders/python3/Makefile.am
+++ b/loaders/python3/Makefile.am
@@ -2,7 +2,7 @@
 
 loaderdir = $(libdir)/libpeas-1.0/loaders
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        $(PEAS_CFLAGS)                  \
        $(GCOV_CFLAGS)                  \
diff --git a/loaders/seed/Makefile.am b/loaders/seed/Makefile.am
index 75566c0..706b364 100644
--- a/loaders/seed/Makefile.am
+++ b/loaders/seed/Makefile.am
@@ -2,7 +2,7 @@
 
 loaderdir = $(libdir)/libpeas-1.0/loaders
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        $(PEAS_CFLAGS)                  \
        $(GCOV_CFLAGS)                  \
diff --git a/peas-demo/Makefile.am b/peas-demo/Makefile.am
index a7ab1b7..ebecf05 100644
--- a/peas-demo/Makefile.am
+++ b/peas-demo/Makefile.am
@@ -2,12 +2,12 @@ SUBDIRS=plugins
 
 bin_PROGRAMS = peas-demo
 
-INCLUDES =                                                             \
-       -I$(top_srcdir)                                                 \
-       -I$(srcdir)                                                     \
-       $(PEAS_CFLAGS)                                                  \
-       $(PEAS_GTK_CFLAGS)                                              \
-       $(WARN_CFLAGS)                                                  \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)         \
+       -I$(srcdir)             \
+       $(PEAS_CFLAGS)          \
+       $(PEAS_GTK_CFLAGS)      \
+       $(WARN_CFLAGS)          \
        $(DISABLE_DEPRECATED)
 
 peas_demo_SOURCES = \
diff --git a/peas-demo/plugins/helloworld/Makefile.am b/peas-demo/plugins/helloworld/Makefile.am
index a7b151c..90f1de1 100644
--- a/peas-demo/plugins/helloworld/Makefile.am
+++ b/peas-demo/plugins/helloworld/Makefile.am
@@ -1,6 +1,6 @@
 plugindir = $(libdir)/peas-demo/plugins/helloworld
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(PEAS_GTK_CFLAGS)
diff --git a/peas-demo/plugins/secondtime/Makefile.am b/peas-demo/plugins/secondtime/Makefile.am
index a20e76c..ca455ae 100644
--- a/peas-demo/plugins/secondtime/Makefile.am
+++ b/peas-demo/plugins/secondtime/Makefile.am
@@ -1,6 +1,6 @@
 plugindir = $(libdir)/peas-demo/plugins/secondtime
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(PEAS_GTK_CFLAGS)
diff --git a/tests/libpeas-gtk/Makefile.am b/tests/libpeas-gtk/Makefile.am
index 22ebb72..4f9b9af 100644
--- a/tests/libpeas-gtk/Makefile.am
+++ b/tests/libpeas-gtk/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = plugins testing
 run-test-hook:
        @test -n "$(DISPLAY)"
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(srcdir)                     \
        -I$(srcdir)/../testing-util     \
diff --git a/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am 
b/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am
index 78d9529..531f340 100644
--- a/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am
+++ b/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(PEAS_GTK_CFLAGS)      \
diff --git a/tests/libpeas-gtk/plugins/configurable/Makefile.am 
b/tests/libpeas-gtk/plugins/configurable/Makefile.am
index 7588069..52f112c 100644
--- a/tests/libpeas-gtk/plugins/configurable/Makefile.am
+++ b/tests/libpeas-gtk/plugins/configurable/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(PEAS_GTK_CFLAGS)      \
diff --git a/tests/libpeas-gtk/testing/Makefile.am b/tests/libpeas-gtk/testing/Makefile.am
index 090a58d..65210c2 100644
--- a/tests/libpeas-gtk/testing/Makefile.am
+++ b/tests/libpeas-gtk/testing/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libtesting.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(srcdir)                             \
        -I$(srcdir)/../../testing-util          \
diff --git a/tests/libpeas/Makefile.am b/tests/libpeas/Makefile.am
index 35d3465..a2b6f49 100644
--- a/tests/libpeas/Makefile.am
+++ b/tests/libpeas/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/tests/Makefile.tests
 
 SUBDIRS = introspection plugins testing
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(srcdir)                     \
        -I$(srcdir)/../testing-util     \
diff --git a/tests/libpeas/introspection/Makefile.am b/tests/libpeas/introspection/Makefile.am
index 4a95e7d..de334e7 100644
--- a/tests/libpeas/introspection/Makefile.am
+++ b/tests/libpeas/introspection/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libintrospection-1.0.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(srcdir)             \
        $(PEAS_CFLAGS)          \
diff --git a/tests/libpeas/plugins/extension-c/Makefile.am b/tests/libpeas/plugins/extension-c/Makefile.am
index d7f1ed7..fadebe1 100644
--- a/tests/libpeas/plugins/extension-c/Makefile.am
+++ b/tests/libpeas/plugins/extension-c/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(srcdir)/../../introspection \
        $(PEAS_CFLAGS)          \
diff --git a/tests/libpeas/testing/Makefile.am b/tests/libpeas/testing/Makefile.am
index ff2908e..d16f168 100644
--- a/tests/libpeas/testing/Makefile.am
+++ b/tests/libpeas/testing/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(srcdir)                             \
        -I$(srcdir)/../introspection            \
diff --git a/tests/plugins/builtin/Makefile.am b/tests/plugins/builtin/Makefile.am
index b909ef3..cb4f73c 100644
--- a/tests/plugins/builtin/Makefile.am
+++ b/tests/plugins/builtin/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(WARN_CFLAGS)          \
diff --git a/tests/plugins/has-dep/Makefile.am b/tests/plugins/has-dep/Makefile.am
index facb48d..22380fc 100644
--- a/tests/plugins/has-dep/Makefile.am
+++ b/tests/plugins/has-dep/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(WARN_CFLAGS)          \
diff --git a/tests/plugins/loadable/Makefile.am b/tests/plugins/loadable/Makefile.am
index c387e5e..6dd5594 100644
--- a/tests/plugins/loadable/Makefile.am
+++ b/tests/plugins/loadable/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(WARN_CFLAGS)          \
diff --git a/tests/plugins/self-dep/Makefile.am b/tests/plugins/self-dep/Makefile.am
index f20079c..edf722b 100644
--- a/tests/plugins/self-dep/Makefile.am
+++ b/tests/plugins/self-dep/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tests/Makefile.plugin
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(PEAS_CFLAGS)          \
        $(WARN_CFLAGS)          \
diff --git a/tests/testing-util/Makefile.am b/tests/testing-util/Makefile.am
index 99513db..139e9bb 100644
--- a/tests/testing-util/Makefile.am
+++ b/tests/testing-util/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(srcdir)                             \
        $(PEAS_CFLAGS)                          \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]