diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-27 19:57:41 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-27 19:57:41 +0200 |
| commit | 8529df552804e5cd05ac785f658cd16ab56f7247 (patch) | |
| tree | 30af064ab23262d7eed0c6f44e41c37a94d7911a /src/ip6-manager | |
| parent | f537c885beb1336d5d497d6261f2d2d8223a57e7 (diff) | |
| parent | d465e5fac63f36bcf4069e36827f4b62c494556d (diff) | |
Merge commit 'upstream/0.8.9997' into experimental
Diffstat (limited to 'src/ip6-manager')
| -rw-r--r-- | src/ip6-manager/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ip6-manager/Makefile.in | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am index b56b197e..b98d6def 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) diff --git a/src/ip6-manager/Makefile.in b/src/ip6-manager/Makefile.in index 344ca0ea..33539f51 100644 --- a/src/ip6-manager/Makefile.in +++ b/src/ip6-manager/Makefile.in @@ -59,7 +59,8 @@ am__DEPENDENCIES_1 = libip6_manager_la_DEPENDENCIES = \ $(top_builddir)/marshallers/libmarshallers.la \ $(top_builddir)/src/logging/libnm-logging.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libip6_manager_la_OBJECTS = libip6_manager_la-nm-ip6-manager.lo libip6_manager_la_OBJECTS = $(am_libip6_manager_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) @@ -316,6 +317,7 @@ libip6_manager_la_SOURCES = \ nm-ip6-manager.h libip6_manager_la_CPPFLAGS = \ + $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_DISABLE_DEPRECATED @@ -323,6 +325,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) |