Use "-internal" suffix instead of "-private"

diff --git a/Makefile.am b/Makefile.am
index 6cff0443ac7f435633b3a3288ccf34b8d5c9f7bc..0ed944cde7da63c65d139f29fd1b5bd8c7cbe75c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ lib_LTLIBRARIES = libkmod/libkmod.la
 
 libkmod_libkmod_la_SOURCES =\
        libkmod/libkmod.h \
-       libkmod/libkmod-private.h \
+       libkmod/libkmod-internal.h \
        libkmod/macro.h \
        libkmod/missing.h \
        libkmod/libkmod.c \
@@ -77,12 +77,12 @@ libkmod_libkmod_la_DEPENDENCIES = libkmod/libkmod-util.la \
 libkmod_libkmod_la_LIBADD = libkmod/libkmod-util.la \
                            ${liblzma_LIBS} ${zlib_LIBS}
 
-noinst_LTLIBRARIES += libkmod/libkmod-private.la
-libkmod_libkmod_private_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
-libkmod_libkmod_private_la_LDFLAGS = $(AM_LDFLAGS) \
+noinst_LTLIBRARIES += libkmod/libkmod-internal.la
+libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
+libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
        -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
-libkmod_libkmod_private_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
-libkmod_libkmod_private_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
+libkmod_libkmod_internal_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
+libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libkmod/libkmod.pc
@@ -113,7 +113,7 @@ tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/lsmod.c \
                     tools/depmod.c tools/log.h tools/log.c \
                     tools/static-nodes.c
 tools_kmod_LDADD = libkmod/libkmod-util.la \
-                  libkmod/libkmod-private.la
+                  libkmod/libkmod-internal.la
 
 ${noinst_SCRIPTS}: tools/kmod
        $(AM_V_GEN) ($(RM) $@; \
@@ -156,12 +156,12 @@ testsuite_init_module_la_LDFLAGS = $(TESTSUITE_OVERRIDE_LIBS_LDFLAGS)
 testsuite_init_module_la_SOURCES = testsuite/init_module.c \
                                   testsuite/mkdir.c testsuite/mkdir.h \
                                   testsuite/stripped-module.h
-testsuite_init_module_la_LIBADD = libkmod/libkmod-private.la
+testsuite_init_module_la_LIBADD = libkmod/libkmod-internal.la
 
 TESTSUITE_CPPFLAGS = $(AM_CPPFLAGS) \
                     -DTESTSUITE_ROOTFS=\"$(abs_top_builddir)/$(ROOTFS)/\" \
                     -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"
-TESTSUITE_LDADD = testsuite/libtestsuite.la libkmod/libkmod-private.la \
+TESTSUITE_LDADD = testsuite/libtestsuite.la libkmod/libkmod-internal.la \
                  libkmod/libkmod-util.la
 
 check_LTLIBRARIES += testsuite/libtestsuite.la

diff --git a/libkmod/docs/Makefile.am b/libkmod/docs/Makefile.am
index 77e20d5d7ec9e3599f7e40ad32d9cbb7ea44db69..7c675813baba58f2a9f223fa18d5033d7535ca34 100644 (file)
--- a/libkmod/docs/Makefile.am
+++ b/libkmod/docs/Makefile.am
@@ -21,7 +21,7 @@ HFILE_GLOB = $(top_srcdir)/libkmod/libkmod.h
 CFILE_GLOB = $(top_srcdir)/libkmod/libkmod.c $(top_srcdir)/libkmod/libkmod-module.c $(top_srcdir)/libkmod/libkmod-list.c
 
 IGNORE_HFILES = macro.h \
-               libkmod-private.h \
+               libkmod-internal.h \
                libkmod-util.h \
                libkmod-array.h \
                libkmod-hash.h \

diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 11b1f3db695bdf9f2a4bef78502ec782e402d1c8..201c349d91c620242b0cb1f861497b381c3d1428 100644 (file)
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
@@ -31,7 +31,7 @@
 #include <dirent.h>
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 struct kmod_alias {
        char *name;

diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c
index 7207ac2cd40a92cc275eebc396e671c734d4d487..1c11a24d7b5ad1dfbcfc9db5d3fbb28760363470 100644 (file)
--- a/libkmod/libkmod-elf.c
+++ b/libkmod/libkmod-elf.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 enum kmod_elf_class {
        KMOD_ELF_32 = (1 << 1),

diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c
index 5313796ad998ad2d670830857538ee7925aa54bc..390f0183a516656396c2a88c3a41a7c9740bd86f 100644 (file)
--- a/libkmod/libkmod-file.c
+++ b/libkmod/libkmod-file.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 #ifdef ENABLE_XZ
 #include <lzma.h>

diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c
index 0f9405988d82c9894de799fd23f0adf8e3550b08..fa7db41243627b7af1c65d526817ec4a6d911262 100644 (file)
--- a/libkmod/libkmod-index.c
+++ b/libkmod/libkmod-index.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <inttypes.h>
 
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 #include "libkmod-index.h"
 #include "macro.h"
 

diff --git a/libkmod/libkmod-private.h b/libkmod/libkmod-internal.h
similarity index 100%
rename from libkmod/libkmod-private.h
rename to libkmod/libkmod-internal.h

diff --git a/libkmod/libkmod-list.c b/libkmod/libkmod-list.c
index 54c994c0e98322340d2902c0a977d174ccffadce..45f512af490ef6371875687fd2c46b3715b6e49f 100644 (file)
--- a/libkmod/libkmod-list.c
+++ b/libkmod/libkmod-list.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 /**
  * SECTION:libkmod-list

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index cc2c076f27a0eb95311b0e81510153cacf800301..0fc11013d801d338da68e42392d926351c476b12 100644 (file)
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -43,7 +43,7 @@
 #endif
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 /**
  * SECTION:libkmod-module

diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index 6b80caa591a5bb68d0a4ddd60458f379d0e8082a..6237ab78e508de267a585691a1e30979daa24911 100644 (file)
--- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 /* These types and tables were copied from the 3.7 kernel sources.
  * As this is just description of the signature format, it should not be

diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
index d1475e7bca44c7cd6c147abbcac752a293616d2b..e636ae1a9cdca9cd4ef9795f6c995a842f985a1e 100644 (file)
--- a/libkmod/libkmod-util.c
+++ b/libkmod/libkmod-util.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 
 /*
  * Read one logical line from a configuration file.

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 788676c9f208487479431a78386f6ea4ac29cc2c..ef83e314c574276d35a54e91ae9727f2ba8e95ff 100644 (file)
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 
 #include "libkmod.h"
-#include "libkmod-private.h"
+#include "libkmod-internal.h"
 #include "libkmod-index.h"
 
 #define KMOD_HASH_SIZE (256)

diff --git a/testsuite/init_module.c b/testsuite/init_module.c
index dad66e5918e318f665c811b749f8a4db5584783a..686f671776b317d2a79fbae1f286af0515e05873 100644 (file)
--- a/testsuite/init_module.c
+++ b/testsuite/init_module.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 
 /* kmod_elf_get_section() is not exported, we need the private header */
-#include <libkmod-private.h>
+#include <libkmod-internal.h>
 
 /* FIXME: hack, change name so we don't clash */
 #undef ERR

diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c
index a0183925829a0b6f642d09b0e9df577523087ed9..5b88caf7a01acc9d87be0782879a5aacceaf1684 100644 (file)
--- a/testsuite/test-blacklist.c
+++ b/testsuite/test-blacklist.c
@@ -27,7 +27,7 @@
 
 /* good luck bulding a kmod_list outside of the library... makes this blacklist
  * function rather pointless */
-#include <libkmod-private.h>
+#include <libkmod-internal.h>
 
 /* FIXME: hack, change name so we don't clash */
 #undef ERR