[network-manager-openswan/danw/cleanup-bgo746693] build: remove some unnecessary stuff

[Dan Winship <danw src gnome org>]

commit 4283f771810c2e8003c1ffa2075da0031f9366bc
Author: Dan Winship <danw redhat com>
Date:   Tue Nov 25 17:26:01 2014 -0500

    build: remove some unnecessary stuff
    
    PKG_CHECK_MODULES() automatically AC_SUBST()s the variables it
    creates, so we don't need to do it ourselves.
    
    Remove unnecessary -I flags from Makefiles, and add one that should
    have been there but wasn't.
    
    Remove "#define NM_VPN_API_SUBJECT_TO_CHANGE", since that define has
    had no effect since before NM 0.7.
    
    Remove never-used icon and .desktop file.

 auth-dialog/Makefile.am                            |    3 +--
 configure.ac                                       |   14 --------------
 ...e-application-x-openswan-ipsec-vpn-settings.png |  Bin 2595 -> 0 bytes
 properties/Makefile.am                             |    4 ++--
 properties/nm-openswan.c                           |    4 +---
 src/Makefile.am                                    |    3 +--
 6 files changed, 5 insertions(+), 23 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index b910693..90d7c4a 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
        -DBINDIR=\""$(bindir)"\" \
        -DG_DISABLE_DEPRECATED \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\" \
-       -I${top_srcdir}
+       -DVERSION=\"$(VERSION)\"
 
 libexec_PROGRAMS = nm-openswan-auth-dialog
 
diff --git a/configure.ac b/configure.ac
index 88ce1b5..5bb2c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,39 +61,25 @@ IT_PROG_INTLTOOL([0.35])
 AM_GLIB_GNU_GETTEXT
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
 
 PKG_CHECK_MODULES(LIBNL, libnl-3.0 >= 3.2.8)
-AC_SUBST(LIBNL_CFLAGS)
-AC_SUBST(LIBNL_LIBS)
 
 PKG_CHECK_MODULES(NM,
        NetworkManager >= 0.9.10
        libnm-util >= 0.9.10
        libnm-glib >= 0.9.10
        libnm-glib-vpn >= 0.9.10)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
 
 if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
-       AC_SUBST(GTK_CFLAGS)
-       AC_SUBST(GTK_LIBS)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
        PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.10)
-       AC_SUBST(NMGTK_CFLAGS)
-       AC_SUBST(NMGTK_LIBS)
 
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
-       AC_SUBST(LIBSECRET_CFLAGS)
-       AC_SUBST(LIBSECRET_LIBS)
 fi
 
 dnl
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 214f478..2d02d5b 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -5,13 +5,13 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(NM_CFLAGS) \
+       -I$(top_srcdir)/src \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
        -DG_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED \
        -DLOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\" \
-       -I${top_srcdir}
+       -DVERSION=\"$(VERSION)\"
 
 libnm_openswan_properties_la_SOURCES = \
        nm-openswan.c \
diff --git a/properties/nm-openswan.c b/properties/nm-openswan.c
index f9687ed..e2c3ccd 100644
--- a/properties/nm-openswan.c
+++ b/properties/nm-openswan.c
@@ -34,14 +34,12 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#define NM_VPN_API_SUBJECT_TO_CHANGE
-
 #include <nm-vpn-plugin-ui-interface.h>
 #include <nm-setting-vpn.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-ip4-config.h>
 
-#include "src/nm-openswan-service.h"
+#include "nm-openswan-service.h"
 #include "nm-openswan.h"
 
 #define OPENSWAN_PLUGIN_NAME    _("IPsec based VPN")
diff --git a/src/Makefile.am b/src/Makefile.am
index 09223f5..003f82c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,8 +12,7 @@ AM_CPPFLAGS = \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        -DLOCALSTATEDIR=\""$(localstatedir)"\" \
        -DDATADIR=\"$(datadir)\" \
-       -DNM_OPENSWAN_LOCALEDIR=\"$(datadir)/locale\" \
-       -I${top_srcdir}
+       -DNM_OPENSWAN_LOCALEDIR=\"$(datadir)/locale\"
 
 libexec_PROGRAMS = nm-openswan-service nm-openswan-service-helper