all: merge branch 'th/nm-default-bgo752857'

- order destruction of singletons

- add new header "nm-default.h" to always include a set of standard
  headers.

https://bugzilla.gnome.org/show_bug.cgi?id=752857

callouts/nm-dispatcher-utils.c

@@ -29,7 +29,7 @@
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 

callouts/nm-dispatcher-utils.h

@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
 #define __NETWORKMANAGER_DISPATCHER_UTILS_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 char **
 nm_dispatcher_utils_construct_envp (const char *action,

callouts/nm-dispatcher.c

@@ -34,7 +34,7 @@
 
 #include <glib-unix.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dispatcher-api.h"
 #include "nm-dispatcher-utils.h"
 

callouts/tests/test-dispatcher-envp.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"

clients/cli/agent.c

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -29,7 +28,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 #include "utils.h"
 #include "nm-secret-agent-simple.h"

clients/cli/common.c

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -29,7 +28,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 #include "utils.h"
 

clients/cli/connections.c

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -30,8 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"

clients/cli/devices.c

@@ -25,9 +25,7 @@
 #include <errno.h>
 #include <readline/readline.h>
 
-#include <glib/gi18n.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-secret-agent-simple.h"
 #include "polkit-agent.h"
 #include "utils.h"

clients/cli/general.c

@@ -22,9 +22,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "polkit-agent.h"
 #include "utils.h"
 #include "general.h"

clients/cli/nmcli.c

@@ -33,9 +33,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <glib/gi18n.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "polkit-agent.h"
 #include "nmcli.h"
 #include "utils.h"

clients/cli/polkit-agent.c

@@ -27,9 +27,7 @@
 #include <unistd.h>
 #include <termios.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "polkit-agent.h"
 #include "nm-polkit-listener.h"
 #include "common.h"
@@ -142,7 +140,7 @@ nmc_start_polkit_agent_start_try (NmCli *nmc)
 #else
 /* polkit agent is not avalable; implement stub functions. */
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmcli.h"
 #include "polkit-agent.h"
 

clients/cli/settings.c

@@ -22,9 +22,7 @@
 #include <stdlib.h>
 #include <arpa/inet.h>
 
-#include <glib/gi18n.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"

clients/cli/utils.c

@@ -29,9 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <glib/gi18n.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "utils.h"
 
 int

clients/common/nm-polkit-listener.c

@@ -36,9 +36,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-polkit-listener.h"
 
 G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER)

clients/common/nm-polkit-listener.h

@@ -22,7 +22,7 @@
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
 #include <polkitagent/polkitagent.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/common/nm-secret-agent-simple.c

@@ -32,8 +32,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
+#include "nm-default.h"
 #include "nm-secret-agent-simple.h"
 
 G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)

clients/nm-online.c

@@ -38,11 +38,9 @@
 #include <getopt.h>
 #include <locale.h>
 
-#include <glib/gi18n.h>
-
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define PROGRESS_STEPS 15
 #define WAIT_STARTUP_TAG "wait-startup"

clients/tui/newt/Makefile.am

@@ -1,5 +1,6 @@
 AM_CPPFLAGS= \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/libnm-core \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
 	$(GLIB_CFLAGS) \
 	$(NEWT_CFLAGS) \

clients/tui/newt/nmt-newt-form.c

@@ -30,8 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt-form.h"
 #include "nmt-newt-button.h"
 #include "nmt-newt-grid.h"

clients/tui/newt/nmt-newt-popup.c

@@ -28,8 +28,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt-popup.h"
 #include "nmt-newt-form.h"
 #include "nmt-newt-hacks.h"

clients/tui/newt/nmt-newt-types.h

@@ -21,7 +21,7 @@
 
 #include <newt.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/tui/newt/nmt-newt-utils.c

@@ -28,9 +28,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-newt-utils.h"
 
 static void

clients/tui/newt/nmt-newt-utils.h

@@ -21,7 +21,7 @@
 
 #include <newt.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/tui/nm-editor-utils.c

@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <NetworkManager.h>
 
+#include "nm-default.h"
 #include "nm-editor-utils.h"
 #if 0
 #include "vpn-helpers.h"

clients/tui/nmt-address-list.c

@@ -35,8 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-address-list.h"
 #include "nmt-ip-entry.h"
 

clients/tui/nmt-connect-connection-list.c

@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 

clients/tui/nmt-device-entry.c

@@ -40,7 +40,6 @@
 #include <sys/socket.h>
 #include <linux/if_arp.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmtui.h"

clients/tui/nmt-edit-connection-list.c

@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmtui.h"
 #include "nmtui-edit.h"
 #include "nmt-edit-connection-list.h"

clients/tui/nmt-editor-page.c

@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-editor-page.h"
 
 G_DEFINE_ABSTRACT_TYPE (NmtEditorPage, nmt_editor_page, G_TYPE_OBJECT)

clients/tui/nmt-editor-section.c

@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-editor-section.h"
 #include "nmt-newt-toggle-button.h"
 

clients/tui/nmt-editor.c

@@ -27,10 +27,9 @@
 
 #include "nmt-editor.h"
 
-#include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmtui.h"
 
 #include "nm-editor-utils.h"

clients/tui/nmt-ip-entry.c

@@ -33,8 +33,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-ip-entry.h"
 
 G_DEFINE_TYPE (NmtIPEntry, nmt_ip_entry, NMT_TYPE_NEWT_ENTRY)

clients/tui/nmt-mac-entry.h

@@ -19,7 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nmt-newt.h"
 

clients/tui/nmt-mtu-entry.c

@@ -34,8 +34,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-mtu-entry.h"
 
 G_DEFINE_TYPE (NmtMtuEntry, nmt_mtu_entry, NMT_TYPE_NEWT_GRID)

clients/tui/nmt-page-bond.c

@@ -27,9 +27,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-bond.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-bridge-port.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-bridge-port.h"
 
 G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)

clients/tui/nmt-page-bridge.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-bridge.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-dsl.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"

clients/tui/nmt-page-dsl.h

@@ -19,7 +19,7 @@
 #ifndef NMT_PAGE_DSL_H
 #define NMT_PAGE_DSL_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

clients/tui/nmt-page-ethernet.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-page-infiniband.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
 

clients/tui/nmt-page-ip4.c

@@ -25,9 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ip6.c

@@ -25,9 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ppp.c

@@ -25,9 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
 #include "nmt-newt-separator.h"

clients/tui/nmt-page-team-port.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-team-port.h"
 
 G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)

clients/tui/nmt-page-team.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-team.h"
 
 #include "nmt-slave-list.h"

clients/tui/nmt-page-team.h

@@ -19,7 +19,7 @@
 #ifndef NMT_PAGE_TEAM_H
 #define NMT_PAGE_TEAM_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

clients/tui/nmt-page-vlan.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"

clients/tui/nmt-page-wifi.c

@@ -29,9 +29,7 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-password-dialog.c

@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-password-dialog.h"
 #include "nm-secret-agent-simple.h"
 #include "nmtui.h"

clients/tui/nmt-password-fields.c

@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-password-fields.h"
 
 G_DEFINE_TYPE (NmtPasswordFields, nmt_password_fields, NMT_TYPE_NEWT_GRID)

clients/tui/nmt-route-editor.c

@@ -27,9 +27,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
 

clients/tui/nmt-route-entry.c

@@ -32,7 +32,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-route-entry.h"

clients/tui/nmt-route-table.c

@@ -30,7 +30,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-route-table.h"

clients/tui/nmt-slave-list.c

@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-slave-list.h"

clients/tui/nmt-utils.h

@@ -19,7 +19,7 @@
 #ifndef NMT_UTILS_H
 #define NMT_UTILS_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/tui/nmt-widget-list.c

@@ -37,8 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-widget-list.h"
 #include "nmt-newt.h"
 

clients/tui/nmtui-connect.c

@@ -28,8 +28,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt.h"
 
 #include "nmtui.h"

clients/tui/nmtui-edit.c

@@ -27,7 +27,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmtui.h"

clients/tui/nmtui-hostname.c

@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt.h"
 
 #include "nmtui.h"

clients/tui/nmtui.c

@@ -30,11 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 

clients/tui/vpn-helpers.c

@@ -32,9 +32,8 @@
 
 #include <string.h>
 #include <gmodule.h>
-#include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "vpn-helpers.h"
 
 #include "nm-macros-internal.h"

clients/tui/vpn-helpers.h

@@ -21,7 +21,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 GSList *vpn_get_plugins (void);
 

include/Makefile.am

@@ -2,6 +2,7 @@ EXTRA_DIST = \
      gsystem-local-alloc.h \
      nm-dbus-compat.h \
      nm-dbus-glib-types.h \
+     nm-default.h \
      nm-glib.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \

include/nm-default.h

@@ -0,0 +1,72 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEFAULT_H__
+#define __NM_DEFAULT_H__
+
+/* makefiles define NETWORKMANAGER_COMPILATION for compiling NetworkManager.
+ * Depending on which parts are compiled, different values are set. */
+#define NM_NETWORKMANAGER_COMPILATION_DEFAULT             0x0001
+#define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON       0x0002
+#define NM_NETWORKMANAGER_COMPILATION_LIB                 0x0004
+
+#ifndef NETWORKMANAGER_COMPILATION
+/* For convenience, we don't require our Makefile.am to define
+ * -DNETWORKMANAGER_COMPILATION. As we now include this internal header,
+ *  we know we do a NETWORKMANAGER_COMPILATION. */
+#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DEFAULT
+#endif
+
+/*****************************************************************************/
+
+/* always include these headers for our internal source files. */
+
+#include "nm-glib.h"
+#include "nm-version.h"
+#include "gsystem-local-alloc.h"
+
+/*****************************************************************************/
+
+#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB
+
+#include <glib/gi18n-lib.h>
+
+#else
+
+#include <glib/gi18n.h>
+
+#endif /* NM_NETWORKMANAGER_COMPILATION_LIB */
+
+/*****************************************************************************/
+
+#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON
+
+/* the header is used inside src/, where additional
+ * headers are available. */
+
+#include "nm-types.h"
+#include "nm-logging.h"
+
+#endif /* NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON */
+
+/*****************************************************************************/
+
+#endif /* __NM_DEFAULT_H__ */

include/nm-macros-internal.h

@@ -22,7 +22,7 @@
 #ifndef __NM_MACROS_INTERNAL_H__
 #define __NM_MACROS_INTERNAL_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 /********************************************************/
 

include/nm-test-utils.h

@@ -89,10 +89,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 
 #ifdef __NETWORKMANAGER_LOGGING_H__
 /* We are running tests under src/. Let's include some files by default.

libnm-core/Makefile.am

@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DNMLIBDIR=\"$(nmlibdir)\" \
-	-DNETWORKMANAGER_COMPILATION \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS)
 

libnm-core/crypto.c

@@ -27,9 +27,8 @@
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto.h

@@ -24,7 +24,7 @@
 #ifndef __CRYPTO_H__
 #define __CRYPTO_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define MD5_HASH_LEN 20
 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"

libnm-core/crypto_gnutls.c

@@ -23,14 +23,12 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto_nss.c

@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <prinit.h>
 #include <nss.h>
 #include <pk11pub.h>
@@ -35,7 +33,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/nm-connection.c

@@ -22,15 +22,13 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
 #include <string.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-internal.h"
-#include "gsystem-local-alloc.h"
 
 /**
  * SECTION:nm-connection

libnm-core/nm-core-internal.h

@@ -34,7 +34,7 @@
  **/
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 #include "nm-dbus-interface.h"
@@ -67,7 +67,6 @@
 #include "nm-setting.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
-#include "nm-version.h"
 #include "nm-vpn-dbus-interface.h"
 
 #define NM_UTILS_CLEAR_CANCELLABLE(c) \

libnm-core/nm-dbus-interface.h

@@ -26,7 +26,7 @@
 #ifndef __NM_DBUS_INTERFACE_H__
 #define __NM_DBUS_INTERFACE_H__
 
-#include "nm-version.h"
+#include <nm-version.h>
 
 /*
  * dbus services details

libnm-core/nm-dbus-utils.c

@@ -21,9 +21,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 
 typedef struct {

libnm-core/nm-errors.c

@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-errors.h"
 #include "nm-dbus-interface.h"
 #include "nm-vpn-dbus-interface.h"

libnm-core/nm-keyfile-internal.h

@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-setting-8021x.h"
 

libnm-core/nm-keyfile-reader.c

@@ -28,12 +28,10 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 

libnm-core/nm-keyfile-utils.c

@@ -23,8 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
 #include "nm-setting-wired.h"

libnm-core/nm-keyfile-writer.c

@@ -28,9 +28,8 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip4-config.h"
@@ -43,7 +42,6 @@
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 
-#include "gsystem-local-alloc.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 

libnm-core/nm-property-compare.c

@@ -27,7 +27,7 @@
 #include <netinet/in.h>
 
 #include "nm-property-compare.h"
-#include "nm-glib.h"
+#include "nm-default.h"
 
 static gint
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)

libnm-core/nm-property-compare.h

@@ -23,7 +23,7 @@
 #ifndef __NM_PROPERTY_COMPARE_H__
 #define __NM_PROPERTY_COMPARE_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 int nm_property_compare (GVariant *value1, GVariant *value2);
 

libnm-core/nm-setting-8021x.c

@@ -23,8 +23,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
+#include "nm-default.h"
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 #include "crypto.h"
@@ -32,7 +32,6 @@
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
 #include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 
 /**
  * SECTION:nm-setting-8021x

libnm-core/nm-setting-adsl.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-adsl.h"
 #include "nm-setting-ppp.h"

libnm-core/nm-setting-bluetooth.c

@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bluetooth.h"
 #include "nm-setting-cdma.h"

libnm-core/nm-setting-bond.c

@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bond.h"
 #include "nm-utils.h"

libnm-core/nm-setting-bridge-port.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge-port.h"
 #include "nm-utils.h"

libnm-core/nm-setting-bridge.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge.h"
 #include "nm-connection-private.h"

libnm-core/nm-setting-cdma.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-cdma.h"
 #include "nm-utils.h"

libnm-core/nm-setting-connection.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"

libnm-core/nm-setting-dcb.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-dcb.h"
 #include "nm-utils.h"

libnm-core/nm-setting-gsm.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-gsm.h"
 #include "nm-utils.h"

libnm-core/nm-setting-infiniband.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-infiniband.h"
 #include "nm-utils.h"

libnm-core/nm-setting-ip-config.c

@@ -24,9 +24,8 @@
 
 #include <string.h>
 #include <arpa/inet.h>
-#include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"

libnm-core/nm-setting-ip4-config.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-ip6-config.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip6-config.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-olpc-mesh.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-olpc-mesh.h"
 #include "nm-dbus-interface.h"

libnm-core/nm-setting-ppp.c

@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 

libnm-core/nm-setting-pppoe.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-pppoe.h"
 #include "nm-setting-ppp.h"