blob: 6560d7ca9232d8b413f27e7f1c05ccb909b7e97e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 8b201faa65b23a1d2c3c1cedc80b40ba26e91be7 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 23 Mar 2011 17:27:54 +0100
Subject: [PATCH 1/2] respect libnl flags also in backends/ip6-manager
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/backends/Makefile.am | 2 ++
src/ip6-manager/Makefile.am | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
index fbec9aa..c0780d0 100644
--- a/src/backends/Makefile.am
+++ b/src/backends/Makefile.am
@@ -63,10 +63,12 @@ endif
libnmbackend_la_LIBADD += \
$(top_builddir)/src/logging/libnm-logging.la \
+ $(LIBNL_LIBS) \
$(DBUS_LIBS) \
$(GLIB_LIBS)
libnmbackend_la_CPPFLAGS = \
+ $(LIBNL_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index b56b197..b98d6de 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -13,6 +13,7 @@ libip6_manager_la_SOURCES = \
nm-ip6-manager.h
libip6_manager_la_CPPFLAGS = \
+ $(LIBNL_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED
@@ -20,6 +21,7 @@ libip6_manager_la_CPPFLAGS = \
libip6_manager_la_LIBADD = \
$(top_builddir)/marshallers/libmarshallers.la \
$(top_builddir)/src/logging/libnm-logging.la \
+ $(LIBNL_LIBS) \
$(DBUS_LIBS) \
$(GLIB_LIBS)
--
1.7.3.4
|