diff options
| author | Dan Winship <danw@gnome.org> | 2014-05-19 13:44:02 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:05 -0400 |
| commit | a7c4d53d036c0f75b0903c95de7cb8fbdc47413f (patch) | |
| tree | 861f6f385edb63a97b405b0593193db382d35aad /callouts | |
| parent | c5daa4c4df07d413e5f760eac5a2f686f6062225 (diff) | |
all: port everything to libnm
Since the API has not changed at this point, this is mostly just a
matter of updating Makefiles, and changing references to the library
name in comments.
NetworkManager cannot link to libnm due to the duplicated type/symbol
names. So it links to libnm-core.la directly, which means that
NetworkManager gets a separate copy of that code from libnm.so.
Everything else links to libnm.
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/Makefile.am | 8 | ||||
| -rw-r--r-- | callouts/tests/Makefile.am | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 3ec4581cad..fc8e94fc4c 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -2,8 +2,8 @@ SUBDIRS = . tests AM_CPPFLAGS = \ -I${top_srcdir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @@ -44,7 +44,7 @@ nm_dispatcher_SOURCES = \ nm-dispatcher-utils.h nm_dispatcher_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/libnm/libnm.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) @@ -63,7 +63,7 @@ libtest_dispatcher_envp_la_CPPFLAGS = \ $(AM_CPPFLAGS) libtest_dispatcher_envp_la_LIBADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/libnm/libnm.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index 67af4d9d66..c0d61877dd 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -2,8 +2,8 @@ if ENABLE_TESTS AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/callouts \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ @@ -18,7 +18,7 @@ test_dispatcher_envp_SOURCES = \ test-dispatcher-envp.c test_dispatcher_envp_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/libnm/libnm.la \ $(top_builddir)/callouts/libtest-dispatcher-envp.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) |