build: rename file "include/nm-utils-internal.h" to "nm-macros-internal.h"

We already have "nm-utils*.h" and "NetworkManagerUtils.h" headers. Rename
"include/nm-utils-internal.h" to "nm-macros-internal.h". I think that
name is better, because this file is header-only, internal, and
repository-wide.

Also, it will never contain non-header-only declarations because
there is no backing object file under "include/".
It will only contain macros and inline functions.

diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 99d64a3..8ae1b7f 100644 (file)
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -29,7 +29,7 @@
 #include "common.h"
 #include "settings.h"
 #include "nm-glib-compat.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Forward declarations */
 static char *wep_key_type_to_string (NMWepKeyType type);

diff --git a/include/Makefile.am b/include/Makefile.am
index 6e84a5b..ff7eac8 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,6 +4,6 @@ EXTRA_DIST = \
      nm-glib-compat.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \
-     nm-utils-internal.h
+     nm-macros-internal.h
 
 CLEANFILES=nm-version.h

diff --git a/include/nm-utils-internal.h b/include/nm-macros-internal.h
similarity index 98%
rename from include/nm-utils-internal.h
rename to include/nm-macros-internal.h
index 82c89dc..d510445 100644 (file)
--- a/include/nm-utils-internal.h
+++ b/include/nm-macros-internal.h
@@ -19,8 +19,8 @@
  * (C) Copyright 2014 Red Hat, Inc.
  */
 
-#ifndef __NM_UTILS_INTERNAL_H__
-#define __NM_UTILS_INTERNAL_H__
+#ifndef __NM_MACROS_INTERNAL_H__
+#define __NM_MACROS_INTERNAL_H__
 
 
 #include <glib.h>
@@ -191,4 +191,4 @@ nm_clear_g_source (guint *id)
 
 /*****************************************************************************/
 
-#endif
+#endif /* __NM_MACROS_INTERNAL_H__ */

diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 3b5b946..d666366 100644 (file)
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -92,7 +92,7 @@
 #include <errno.h>
 
 #include "nm-utils.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 

diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index 4887e52..7e2a8c1 100644 (file)
--- a/libnm-core/nm-keyfile-reader.c
+++ b/libnm-core/nm-keyfile-reader.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "nm-core-internal.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
 #include "nm-glib-compat.h"
 #include "nm-keyfile-internal.h"

diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index f355c18..8024624 100644 (file)
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -31,7 +31,7 @@
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
 
 /**

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 12cdffb..bca343b 100644 (file)
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -37,7 +37,7 @@
 #include "nm-setting-private.h"
 #include "crypto.h"
 #include "gsystem-local-alloc.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 #include "nm-setting-bond.h"
 #include "nm-setting-bridge.h"

diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 0f0548a..28d659f 100644 (file)
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
 

diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 1dc768c..678d70a 100644 (file)
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -33,7 +33,7 @@
 #include "crypto.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-8021x

diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 022fa70..d0c2ca3 100644 (file)
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -37,7 +37,7 @@
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Embed the commit id in the build binary */
 static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : "";

diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 213d33a..cec6d13 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -32,7 +32,7 @@
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
 #include "gsystem-local-alloc.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 #define CLIENTID_TAG            "send dhcp-client-identifier"
 

diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c
index ffbc836..df5eed3 100644 (file)
--- a/src/dhcp-manager/tests/test-dhcp-dhclient.c
+++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c
@@ -32,7 +32,7 @@
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-logging.h"
 
 #include "nm-test-utils.h"

diff --git a/src/nm-logging.h b/src/nm-logging.h
index be453a2..d02e165 100644 (file)
--- a/src/nm-logging.h
+++ b/src/nm-logging.h
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Log domains */
 typedef enum  { /*< skip >*/

diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index c57f2cf..87f4aba 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "nm-core-internal.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "NetworkManagerUtils.h"
 
 #include "utils.h"