summaryrefslogtreecommitdiff
path: root/properties
diff options
context:
space:
mode:
authorDan Winship <danw@redhat.com>2014-11-25 17:27:53 -0500
committerDan Winship <danw@redhat.com>2015-03-24 10:52:52 -0400
commitd4493e7dba0cc60d0bb126c6053fe7650dd89ac0 (patch)
tree6cfa4ea1634206751938b68d8a006737ad7df9f2 /properties
parent181819090f7a4ac747df4b38da3a23b8a5e2a35c (diff)
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. Drop unnecessary explicit checks for gthread and dbus-glib. Remove unused INCLUDES= lines from Makefiles. Remove stray GConf references. Remove "#define NM_VPN_API_SUBJECT_TO_CHANGE", since that define has had no effect since before NM 0.7.
Diffstat (limited to 'properties')
-rw-r--r--properties/Makefile.am2
-rw-r--r--properties/nm-iodine.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 30e7529..0b72cb7 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -10,7 +10,6 @@ ui_DATA = nm-iodine-dialog.ui
libnm_iodine_properties_la_CFLAGS = \
$(GTK_CFLAGS) \
- $(GCONF_CFLAGS) \
$(NM_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
@@ -22,7 +21,6 @@ libnm_iodine_properties_la_CFLAGS = \
libnm_iodine_properties_la_LIBADD = \
$(GTK_LIBS) \
- $(GCONF_LIBS) \
$(NM_LIBS)
libnm_iodine_properties_la_LDFLAGS = \
diff --git a/properties/nm-iodine.c b/properties/nm-iodine.c
index b1e7537..41ed7af 100644
--- a/properties/nm-iodine.c
+++ b/properties/nm-iodine.c
@@ -33,8 +33,6 @@
#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>