From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Thu, 4 Jul 2013 19:13:11 +0000 (-0300)
Subject: Use "-internal" suffix instead of "-private"
X-Git-Tag: v15~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83b855a6ed7028173e231eab0a39c929a962ddf5;p=thirdparty%2Fkmod.git

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

diff --git a/Makefile.am b/Makefile.am
index 6cff0443..0ed944cd 100644
--- 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 77e20d5d..7c675813 100644
--- 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 11b1f3db..201c349d 100644
--- 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 7207ac2c..1c11a24d 100644
--- 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 5313796a..390f0183 100644
--- 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 0f940598..fa7db412 100644
--- 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 54c994c0..45f512af 100644
--- 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 cc2c076f..0fc11013 100644
--- 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 6b80caa5..6237ab78 100644
--- 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 d1475e7b..e636ae1a 100644
--- 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 788676c9..ef83e314 100644
--- 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 dad66e59..686f6717 100644
--- 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 a0183925..5b88caf7 100644
--- 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