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.

9 files changed, 23 insertions, 26 deletions

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 616887df15..1d622773d8 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,12 +1,10 @@
 SUBDIRS = cli tui
 
 AM_CPPFLAGS = \
-	-I${top_srcdir} \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-glib \
-	-I${top_builddir}/libnm-glib \
-	-I${top_srcdir}/include \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm \
+	-I${top_builddir}/libnm \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
@@ -20,7 +18,6 @@ nm_online_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 nm_online_LDADD = \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm/libnm.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS)
diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am
index 65df699abd..1ad761c8ef 100644
--- a/clients/cli/Makefile.am
+++ b/clients/cli/Makefile.am
@@ -5,9 +5,10 @@ AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir} \
 	-I${top_srcdir}/include \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm \
+	-I${top_builddir}/libnm \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nmcli"\" \
@@ -34,8 +35,7 @@ nmcli_LDADD = \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(READLINE_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la
+	$(top_builddir)/libnm/libnm.la
 
 if BUILD_SETTING_DOCS
 settings-docs.c: settings-docs.xsl $(top_builddir)/libnm-util/nm-setting-docs.xml
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 1ee5c09976..5236431d73 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -897,7 +897,7 @@ nmc_device_reason_to_string (NMDeviceStateReason reason)
 }
 
 
-/* Max priority values from libnm-util/nm-setting-vlan.c */
+/* Max priority values from libnm-core/nm-setting-vlan.c */
 #define MAX_SKB_PRIO   G_MAXUINT32
 #define MAX_8021P_PRIO 7  /* Max 802.1p priority */
 
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 71c273f014..10660213d2 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -2220,7 +2220,7 @@ static const NameItem nmc_adsl_settings [] = {
 };
 
 /* PPPoE is a base connection type from historical reasons.
- * See libnm-util/nm-setting.c:_nm_setting_is_base_type()
+ * See libnm-core/nm-setting.c:_nm_setting_is_base_type()
  */
 static const NameItem nmc_pppoe_settings [] = {
 	{ NM_SETTING_CONNECTION_SETTING_NAME, NULL,       NULL, TRUE  },
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index fd211b107c..163832eac7 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -105,7 +105,7 @@ typedef enum {
 
 /* NmCli - main structure */
 typedef struct _NmCli {
-	NMClient *client;                                 /* Pointer to NMClient of libnm-glib */
+	NMClient *client;                                 /* Pointer to NMClient of libnm */
 	NMClient *(*get_client) (struct _NmCli *nmc);     /* Pointer to function for creating NMClient */
 
 	NMCResultCode return_value;                       /* Return code of nmcli */
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 226e6ae4d3..a34f3c8338 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <libnm-util/nm-utils.h>
+#include <nm-utils.h>
 
 #include "utils.h"
 #include "common.h"
@@ -2340,7 +2340,7 @@ nmc_property_con_set_uuid (NMSetting *setting, const char *prop, const char *val
 #endif
 
 /* 'permissions' */
-/* define from libnm-util/nm-setting-connection.c */
+/* define from libnm-core/nm-setting-connection.c */
 #define PERM_USER_PREFIX  "user:"
 
 static gboolean
@@ -3913,7 +3913,7 @@ nmc_property_wired_set_s390_subchannels (NMSetting *setting, const char *prop, c
 	char **strv = NULL, **iter;
 	GPtrArray *s390_subchannels;
 
-	//FIXME: both libnm-util and ifcfg-rh also allow two strings (3rd is optional)
+	//FIXME: both libnm and ifcfg-rh also allow two strings (3rd is optional)
 	strv = nmc_strsplit_set (val, " ,\t", 0);
 	if (g_strv_length (strv) != 3) {
 		g_set_error (error, 1, 0, _("'%s' is not valid; 3 strings should be provided"),
diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am
index 7ca1b9196c..f6dacb801c 100644
--- a/clients/tui/Makefile.am
+++ b/clients/tui/Makefile.am
@@ -5,9 +5,10 @@ SUBDIRS = newt .
 AM_CPPFLAGS= \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-I$(top_srcdir)/libnm \
+	-I$(top_builddir)/libnm \
 	-I$(srcdir)/newt \
 	$(GLIB_CFLAGS) \
 	$(NEWT_CFLAGS) \
@@ -113,8 +114,7 @@ nmtui_SOURCES = \
 	$(NULL)
 
 nmtui_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
+	$(top_builddir)/libnm/libnm.la \
 	$(builddir)/newt/libnmt-newt.a \
 	$(GUDEV_LIBS) \
 	$(DBUS_LIBS) \
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index 8172b84368..19bd39989e 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -273,7 +273,7 @@ nmt_newt_form_destroy (NmtNewtForm *form)
 
 /* A "normal" newt program would call newtFormRun() to run newt's main loop
  * and process events. But we want to let GLib's main loop control the program
- * (eg, so libnm-glib can process D-Bus notifications). So we call this function
+ * (eg, so libnm can process D-Bus notifications). So we call this function
  * to run a single iteration of newt's main loop (or rather, to run newt's
  * main loop for 1ms) whenever there are events for newt to process (redrawing
  * or keypresses).
diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
index f4e32837a8..2bdb501a37 100644
--- a/clients/tui/vpn-helpers.c
+++ b/clients/tui/vpn-helpers.c
@@ -21,7 +21,7 @@
  * @short_description: VPN-related utilities
  *
  * This is copied directly from libnm-gtk and should probably
- * eventually move into libnm-glib.
+ * eventually move into libnm.
  *
  * It is also currently unused in nmtui.
  *