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

[thirdparty/kmod.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8e8bcc0350204f738886aad2075961b8e3c23c1a..0ed944cde7da63c65d139f29fd1b5bd8c7cbe75c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@ AM_MAKEFLAGS = --no-print-directory
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -I$(top_srcdir)/libkmod \
-       -DROOTPREFIX=\""$(rootprefix)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        ${zlib_CFLAGS}
@@ -38,7 +37,7 @@ SED_PROCESS = \
        $(SED_PROCESS)
 
 LIBKMOD_CURRENT=4
-LIBKMOD_REVISION=0
+LIBKMOD_REVISION=4
 LIBKMOD_AGE=2
 
 noinst_LTLIBRARIES = libkmod/libkmod-util.la
@@ -54,8 +53,9 @@ 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 \
        libkmod/libkmod-list.c \
        libkmod/libkmod-config.c \
@@ -63,7 +63,8 @@ libkmod_libkmod_la_SOURCES =\
        libkmod/libkmod-index.h \
        libkmod/libkmod-module.c \
        libkmod/libkmod-file.c \
-       libkmod/libkmod-elf.c
+       libkmod/libkmod-elf.c \
+       libkmod/libkmod-signature.c
 
 EXTRA_DIST += libkmod/libkmod.sym
 EXTRA_DIST += libkmod/README libkmod/COPYING testsuite/COPYING COPYING
@@ -76,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
@@ -109,16 +110,12 @@ noinst_SCRIPTS = tools/insmod tools/rmmod tools/lsmod \
 tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/lsmod.c \
                     tools/rmmod.c tools/insmod.c \
                     tools/modinfo.c tools/modprobe.c \
-                    tools/depmod.c
+                    tools/depmod.c tools/log.h tools/log.c \
+                    tools/static-nodes.c
 tools_kmod_LDADD = libkmod/libkmod-util.la \
-                  libkmod/libkmod.la
+                  libkmod/libkmod-internal.la
 
-noinst_PROGRAMS = tools/kmod-nolib
-tools_kmod_nolib_SOURCES = $(tools_kmod_SOURCES)
-tools_kmod_nolib_LDADD = libkmod/libkmod-util.la \
-                        libkmod/libkmod-private.la
-
-${noinst_SCRIPTS}: tools/kmod-nolib
+${noinst_SCRIPTS}: tools/kmod
        $(AM_V_GEN) ($(RM) $@; \
                $(LN_S) $(notdir $<) $@)
 endif
@@ -159,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
@@ -177,7 +174,9 @@ testsuite_libtestsuite_la_LIBADD = -lrt
 
 TESTSUITE = testsuite/test-init testsuite/test-testsuite testsuite/test-loaded \
            testsuite/test-modinfo testsuite/test-alias testsuite/test-new-module \
-           testsuite/test-modprobe testsuite/test-blacklist testsuite/test-dependencies
+           testsuite/test-modprobe testsuite/test-blacklist \
+           testsuite/test-dependencies testsuite/test-depmod
+
 check_PROGRAMS = $(TESTSUITE)
 TESTS = $(TESTSUITE)
 
@@ -199,6 +198,8 @@ testsuite_test_blacklist_LDADD = $(TESTSUITE_LDADD)
 testsuite_test_blacklist_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_test_dependencies_LDADD = $(TESTSUITE_LDADD)
 testsuite_test_dependencies_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
+testsuite_test_depmod_LDADD = $(TESTSUITE_LDADD)
+testsuite_test_depmod_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 
 testsuite-distclean:
        $(RM) -r $(ROOTFS)