summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-11-05 14:39:07 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-11-05 14:48:23 +0100
commit302914c010ae547eeb01520405bb2a55d7d30d7f (patch)
tree4d2664d86848265f354d7974cd20c49d7cdb6c46
parent112f3f8aca99d96bf94d724769e563cc44e5a4c9 (diff)
downloadNetworkManager-302914c010ae547eeb01520405bb2a55d7d30d7f.tar.gz
build: add missing GLIB_CFLAGS
The library and the include paths are dragged in with DBUS_CFLAGS but we need more; especially the GLIB_VERSION_{MIN/MAX}_REQUIRED macros. Otherwise we get deprecation warnings. No master commit, since this was fixed as a side-effect of the GDBus merge.
-rw-r--r--src/devices/bluetooth/Makefile.am1
-rw-r--r--src/devices/wwan/Makefile.am1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index 68cea3d2bc..e6e378f0a1 100644
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c
diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index f2f34d9749..055b07b934 100644
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(MM_GLIB_CFLAGS)
BUILT_SOURCES = $(null)