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/backends | |
| parent | f537c885beb1336d5d497d6261f2d2d8223a57e7 (diff) | |
| parent | d465e5fac63f36bcf4069e36827f4b62c494556d (diff) | |
Merge commit 'upstream/0.8.9997' into experimental
Diffstat (limited to 'src/backends')
| -rw-r--r-- | src/backends/Makefile.am | 2 | ||||
| -rw-r--r-- | src/backends/Makefile.in | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index fbec9aaf..c0780d0b 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/backends/Makefile.in b/src/backends/Makefile.in index a9ea3e80..2f489e75 100644 --- a/src/backends/Makefile.in +++ b/src/backends/Makefile.in @@ -71,7 +71,8 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = libnmbackend_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(top_builddir)/src/logging/libnm-logging.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am__libnmbackend_la_SOURCES_DIST = NetworkManagerGeneric.c \ NetworkManagerGeneric.h NetworkManagerRedHat.c \ NetworkManagerSuSE.c NetworkManagerGentoo.c \ @@ -362,9 +363,10 @@ libnmbackend_la_SOURCES = NetworkManagerGeneric.c \ $(am__append_10) $(am__append_11) $(am__append_12) \ $(am__append_13) libnmbackend_la_LIBADD = $(am__append_9) \ - $(top_builddir)/src/logging/libnm-logging.la $(DBUS_LIBS) \ - $(GLIB_LIBS) + $(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 \ |