[network-manager-openvpn] all: drop -DVERSION
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn] all: drop -DVERSION
- Date: Fri, 23 Oct 2015 15:09:35 +0000 (UTC)
commit 370cb6a58041d25db779512b24a232ca5860a831
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Oct 23 17:04:47 2015 +0200
all: drop -DVERSION
We shouldn't override it with a compiler flag, autoconf generates it into
config.h.
auth-dialog/Makefile.am | 3 +--
properties/Makefile.am | 3 +--
src/Makefile.am | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 142f995..8d9827a 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -9,8 +9,7 @@ nm_openvpn_auth_dialog_CPPFLAGS = \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -DVERSION=\"$(VERSION)\"
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\"
nm_openvpn_auth_dialog_SOURCES = \
main.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 7c3c862..e9222c5 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -26,8 +26,7 @@ common_CFLAGS = \
-I$(top_srcdir)/src \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DVERSION=\"$(VERSION)\"
+ -DLOCALEDIR=\"$(datadir)/locale\"
libnm_vpn_plugin_openvpn_la_CFLAGS = \
$(common_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c3c3a3..68dc516 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
-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]