[network-manager-vpnc/danw/cleanup-bgo746693: 1/3] build: remove some unnecessary stuff

[Dan Winship <danw src gnome org>]

commit cfe1c1f98dc12a276dd26d14a1722bccca834989
Author: Dan Winship <danw gnome org>
Date:   Thu Nov 6 17:41: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 some stray references to gnome-keyring that didn't get removed
    when we ported to libsecret.
    
    Remove unnecessary -I flags from Makefiles.
    
    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.
    
    Remove alleged example that uses GConf.

 Makefile.am                                     |   18 +-----------------
 auth-dialog/Makefile.am                         |    2 --
 configure.ac                                    |   13 -------------
 doc/example-vpnc-system-wide-connection.sh      |   23 -----------------------
 gnome-mime-application-x-cisco-vpn-settings.png |  Bin 2595 -> 0 bytes
 nm-vpnc.desktop.in                              |   11 -----------
 properties/Makefile.am                          |    6 +-----
 properties/nm-vpnc.c                            |    2 --
 properties/tests/Makefile.am                    |    4 ----
 properties/tests/test-import-export.c           |    1 -
 src/Makefile.am                                 |    2 --
 11 files changed, 2 insertions(+), 80 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e3d9ea5..377c590 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,20 +12,6 @@ dbusservice_DATA = nm-vpnc-service.conf
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-vpnc-service.name
 
-desktopfile = nm-vpnc.desktop.in
-iconfile = gnome-mime-application-x-cisco-vpn-settings.png
-
-if WITH_GNOME
-# FIXME: uncomment when nmce gets --import support
-#desktopdir = $(datadir)/applications
-#desktop_in_files = $(desktopfile)
-#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-# INTLTOOL_DESKTOP_RULE@
-
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = $(iconfile)
-endif
-
 nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
        sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
@@ -37,14 +23,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 EXTRA_DIST = nm-vpnc-service.name.in \
              $(dbusservice_DATA)  \
-             $(desktopfile) \
-             $(iconfile) \
              intltool-extract.in  \
              intltool-merge.in    \
              intltool-update.in \
              nm-test-helpers.h
 
-CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 441465c..665fc26 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,5 +1,3 @@
-INCLUDES = -I${top_srcdir}
-
 libexec_PROGRAMS = nm-vpnc-auth-dialog
 
 nm_vpnc_auth_dialog_CPPFLAGS = \
diff --git a/configure.ac b/configure.ac
index a49c277..219ab13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,27 +58,16 @@ 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)
 
 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.9.0)
-       AC_SUBST(NMGTK_CFLAGS)
-       AC_SUBST(NMGTK_LIBS)
-
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
-       AC_SUBST(LIBSECRET_CFLAGS)
-       AC_SUBST(LIBSECRET_LIBS)
 fi
 
 PKG_CHECK_MODULES(NM,
@@ -86,8 +75,6 @@ PKG_CHECK_MODULES(NM,
                   libnm-util >= 0.9.6
                   libnm-glib >= 0.9.6
                   libnm-glib-vpn >= 0.9.6)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
 
 NM_COMPILER_WARNINGS
 
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 310893c..c2f6128 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS=. tests
 
-INCLUDES = -I${top_srcdir}
-
 plugindir = $(libdir)/NetworkManager
 plugin_LTLIBRARIES = libnm-vpnc-properties.la
 
@@ -17,7 +15,6 @@ ui_DATA = nm-vpnc-dialog.ui
 libnm_vpnc_properties_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(GNOMEKEYRING_CFLAGS) \
        $(NM_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
@@ -27,8 +24,7 @@ libnm_vpnc_properties_la_CPPFLAGS = \
 
 libnm_vpnc_properties_la_LIBADD = \
        $(GTK_LIBS) \
-       $(NM_LIBS) \
-       $(GNOMEKEYRING_LIBS)
+       $(NM_LIBS)
 
 libnm_vpnc_properties_la_LDFLAGS = \
         -avoid-version
diff --git a/properties/nm-vpnc.c b/properties/nm-vpnc.c
index 57ac61c..f46da4a 100644
--- a/properties/nm-vpnc.c
+++ b/properties/nm-vpnc.c
@@ -39,8 +39,6 @@
 #include <glib/gi18n-lib.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>
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index fc1a6dd..25229e9 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS=pcf
 
-INCLUDES = -I${top_srcdir}
-
 noinst_PROGRAMS = test-import-export
 
 test_import_export_SOURCES = \
@@ -10,14 +8,12 @@ test_import_export_SOURCES = \
 test_import_export_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(GNOMEKEYRING_CFLAGS) \
        $(NM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 test_import_export_LDADD = \
        $(GTHREAD_LIBS) \
        $(GTK_LIBS) \
-       $(GNOMEKEYRING_LIBS) \
        $(DBUS_LIBS) \
        $(NM_LIBS) \
        $(top_builddir)/properties/libnm-vpnc-properties.la
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 5c435c6..75b73e3 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -31,7 +31,6 @@
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-vpn.h>
 
-#define NM_VPN_API_SUBJECT_TO_CHANGE
 #include <nm-vpn-plugin-ui-interface.h>
 
 #include "nm-test-helpers.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index aaa467f..88a0a7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-INCLUDES = -I${top_srcdir} 
-
 AM_CPPFLAGS = \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS) \