[network-manager-vpnc] all: remove useless defines



commit 9c54e7cb0d5322e337624a4eda100efd94067de6
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Oct 23 17:43:44 2015 +0200

    all: remove useless defines
    
    VERSION is defined in config.h, we shouldn't define or redefine it.
    
    There's no point in G_*_DEPRECATED by default other that it may break the build
    in future.

 auth-dialog/Makefile.am |    5 +----
 auth-dialog/main.c      |    2 --
 configure.ac            |    2 +-
 properties/Makefile.am  |    3 +--
 src/Makefile.am         |    2 --
 5 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 900e8b6..580e1a6 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -8,10 +8,7 @@ nm_vpnc_auth_dialog_CPPFLAGS = \
        $(LIBSECRET_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
-       -DG_DISABLE_DEPRECATED \
-       -DGNOME_DISABLE_DEPRECATED \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\"
+       -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 nm_vpnc_auth_dialog_SOURCES = \
        main.c
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 62b38e6..d07526c 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -29,8 +29,6 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-
-#define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
 #include <NetworkManager.h>
diff --git a/configure.ac b/configure.ac
index 4b58194..c9cbd74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ if test x"$with_gnome" != xno; then
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
        PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
-       PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
+       PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
 
        if test x"$with_libnm_glib" != xno; then
                PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.9.0)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 0e4def3..c56a68e 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -24,8 +24,7 @@ common_CFLAGS = \
        -I$(top_srcdir)/src/ \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\"
+       -DLOCALEDIR=\"$(datadir)/locale\"
 
 libnm_vpn_plugin_vpnc_la_CFLAGS = \
        $(common_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index a544287..f71c269 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,9 @@
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBNM_CFLAGS) \
-       -DG_DISABLE_DEPRECATED \
        -DBINDIR=\"$(bindir)\" \
        -DPREFIX=\""$(prefix)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DVERSION="\"$(VERSION)\"" \
        -DLIBDIR=\""$(libdir)"\" \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        -DLOCALSTATEDIR=\""$(localstatedir)"\" \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]