[network-manager-openswan: 20/25] build: remove usage of INCLUDES

[Dan Williams <dcbw src gnome org>]

commit 6df6ca88822d9e0d1a1808027ff99a5130be5d8f
Author: Dan Williams <dcbw redhat com>
Date:   Fri Aug 29 14:45:05 2014 -0500

    build: remove usage of INCLUDES

 auth-dialog/Makefile.am |   14 ++++++--------
 properties/Makefile.am  |   21 ++++++++++-----------
 src/Makefile.am         |    5 ++---
 3 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 008fd01..b910693 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,8 +1,4 @@
-INCLUDES = -I${top_srcdir}
-
-libexec_PROGRAMS = nm-openswan-auth-dialog
-
-nm_openswan_auth_dialog_CPPFLAGS = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(NM_CFLAGS) \
        $(GTK_CFLAGS) \
@@ -12,10 +8,12 @@ nm_openswan_auth_dialog_CPPFLAGS = \
        -DBINDIR=\""$(bindir)"\" \
        -DG_DISABLE_DEPRECATED \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\"
+       -DVERSION=\"$(VERSION)\" \
+       -I${top_srcdir}
+
+libexec_PROGRAMS = nm-openswan-auth-dialog
 
-nm_openswan_auth_dialog_SOURCES = \
-       main.c
+nm_openswan_auth_dialog_SOURCES = main.c
 
 nm_openswan_auth_dialog_LDADD = \
        $(NM_LIBS) \
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 2633f7e..214f478 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,16 +1,7 @@
-INCLUDES = -I${top_srcdir}
-
 plugindir = $(libdir)/NetworkManager
 plugin_LTLIBRARIES = libnm-openswan-properties.la
 
-libnm_openswan_properties_la_SOURCES = \
-       nm-openswan.c \
-       nm-openswan.h
-
-uidir = $(datadir)/gnome-vpn-properties/openswan
-ui_DATA = nm-openswan-dialog.ui
-
-libnm_openswan_properties_la_CPPFLAGS = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(NM_CFLAGS) \
@@ -19,7 +10,12 @@ libnm_openswan_properties_la_CPPFLAGS = \
        -DG_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED \
        -DLOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\"
+       -DVERSION=\"$(VERSION)\" \
+       -I${top_srcdir}
+
+libnm_openswan_properties_la_SOURCES = \
+       nm-openswan.c \
+       nm-openswan.h
 
 libnm_openswan_properties_la_LIBADD = \
        $(GTK_LIBS) \
@@ -28,6 +24,9 @@ libnm_openswan_properties_la_LIBADD = \
 libnm_openswan_properties_la_LDFLAGS = \
         -avoid-version
 
+uidir = $(datadir)/gnome-vpn-properties/openswan
+ui_DATA = nm-openswan-dialog.ui
+
 CLEANFILES = *.bak *~
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/src/Makefile.am b/src/Makefile.am
index 88b81fc..eb364ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-INCLUDES = -I${top_srcdir} 
-
 AM_CPPFLAGS = \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS) \
@@ -14,7 +12,8 @@ AM_CPPFLAGS = \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        -DLOCALSTATEDIR=\""$(localstatedir)"\" \
        -DDATADIR=\"$(datadir)\" \
-       -DNM_OPENSWAN_LOCALEDIR=\"$(datadir)/locale\"
+       -DNM_OPENSWAN_LOCALEDIR=\"$(datadir)/locale\" \
+       -I${top_srcdir}
 
 libexec_PROGRAMS = nm-openswan-service nm-openswan-service-helper