[network-manager-pptp/lr/libnm: 2/8] build: use AM_CPPFLAGS, avoid deprecated INCLUDES
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-pptp/lr/libnm: 2/8] build: use AM_CPPFLAGS, avoid deprecated INCLUDES
- Date: Fri, 21 Aug 2015 10:48:24 +0000 (UTC)
commit 083791b7089920e84b1d6aae3384934e291923db
Author: Jiří Klimeš <jklimes redhat com>
Date: Thu May 21 17:13:55 2015 +0200
build: use AM_CPPFLAGS, avoid deprecated INCLUDES
Since automake 1.12.4, the warnings are issued on running automake:
warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Avoid INCLUDES and roll these flags into AM_CPPFLAGS.
[lkundrak v3 sk:fix an out-of-tree build]
auth-dialog/Makefile.am | 3 +--
properties/Makefile.am | 2 +-
src/Makefile.am | 9 ++++-----
3 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 48f547b..b1202a9 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,5 +1,3 @@
-INCLUDES = -I${top_srcdir}
-
libexec_PROGRAMS = nm-pptp-auth-dialog
nm_pptp_auth_dialog_CPPFLAGS = \
@@ -8,6 +6,7 @@ nm_pptp_auth_dialog_CPPFLAGS = \
$(GTK_CFLAGS) \
$(NMGTK_CFLAGS) \
$(LIBSECRET_CFLAGS) \
+ -I${top_srcdir} \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
diff --git a/properties/Makefile.am b/properties/Makefile.am
index c3c569e..190dbcd 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,7 @@
plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-pptp-properties.la
-INCLUDES = -I${top_srcdir}
+AM_CPPFLAGS = -I${top_srcdir}
libnm_pptp_properties_la_SOURCES = \
nm-pptp.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index d37d065..d3a210a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,8 @@
-INCLUDES = -I${top_srcdir}
-
AM_CPPFLAGS = \
- $(DBUS_GLIB_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
$(GLIB_CFLAGS) \
- $(NM_CFLAGS) \
+ $(NM_CFLAGS) \
+ -I${top_srcdir} \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DPREFIX=\""$(prefix)"\" \
@@ -11,7 +10,7 @@ AM_CPPFLAGS = \
-DNM_VERSION="\"$(VERSION)\"" \
-DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
- -DLOCALSTATEDIR=\""$(localstatedir)"\" \
+ -DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\" \
-DNM_PPTP_LOCALEDIR=\"$(datadir)/locale\" \
-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]