Install kmod.pc in ${datadir}/pkgconfig

[thirdparty/kmod.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 59dcaaf1ccf981e3a1fad98c6ffe9792abf43c9d..e2e2411188cf261d7cfb796b5b58aa3909e8ec7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ AM_LDFLAGS = $(OUR_LDFLAGS)
 # 6. If any interfaces have been removed or changed since the last public
 #    release, then set age to 0.
 LIBKMOD_CURRENT=6
-LIBKMOD_REVISION=1
+LIBKMOD_REVISION=2
 LIBKMOD_AGE=4
 
 noinst_LTLIBRARIES = shared/libshared.la
@@ -96,8 +96,8 @@ libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
 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 tools/kmod.pc
+pkgconfig_DATA = libkmod/libkmod.pc
+noarch_pkgconfig_DATA = tools/kmod.pc
 
 bashcompletiondir=@bashcompletiondir@
 dist_bashcompletion_DATA = \
@@ -111,9 +111,19 @@ install-exec-hook:
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libkmod.so && \
                mv $(DESTDIR)$(libdir)/libkmod.so.* $(DESTDIR)$(rootlibdir); \
        fi
+if BUILD_TOOLS
+       for tool in insmod lsmod rmmod depmod modprobe modinfo; do \
+               $(LN_S) -f kmod $(DESTDIR)$(bindir)/$$tool; \
+       done
+endif
 
 uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libkmod.so*
+if BUILD_TOOLS
+       for tool in insmod lsmod rmmod depmod modprobe modinfo; do \
+               rm -f $(DESTDIR)$(bindir)/$$tool; \
+       done
+endif
 
 if BUILD_TOOLS
 bin_PROGRAMS = tools/kmod
@@ -129,12 +139,6 @@ tools_kmod_SOURCES = \
        tools/depmod.c tools/log.h tools/log.c \
        tools/static-nodes.c
 
-if BUILD_EXPERIMENTAL
-tools_kmod_SOURCES += \
-       tools/insert.c \
-       tools/remove.c
-endif
-
 tools_kmod_LDADD = \
        shared/libshared.la \
        libkmod/libkmod-internal.la
@@ -260,11 +264,6 @@ TESTSUITE = \
        testsuite/test-dependencies testsuite/test-depmod \
        testsuite/test-list
 
-if BUILD_EXPERIMENTAL
-TESTSUITE += \
-       testsuite/test-tools
-endif
-
 check_PROGRAMS = $(TESTSUITE)
 TESTS = $(TESTSUITE)
 
@@ -307,11 +306,6 @@ testsuite_test_depmod_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_test_list_LDADD = $(TESTSUITE_LDADD)
 testsuite_test_list_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 
-if BUILD_EXPERIMENTAL
-testsuite_test_tools_LDADD = $(TESTSUITE_LDADD)
-testsuite_test_tools_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
-endif
-
 testsuite-distclean:
        $(RM) -r $(ROOTFS)
        $(RM) testsuite/stamp-rootfs
@@ -416,13 +410,3 @@ tar: kmod-$(VERSION).tar.xz kmod-$(VERSION).tar.sign
 
 tar-sync: kmod-$(VERSION).tar.xz kmod-$(VERSION).tar.sign
        kup put kmod-$(VERSION).tar.xz  kmod-$(VERSION).tar.sign /pub/linux/utils/kernel/kmod/
-
-# ------------------------------------------------------------------------------
-# mkosi
-# ------------------------------------------------------------------------------
-
-DISTRO ?= "arch"
-
-mkosi:
-       -$(MKDIR_P) $(top_srcdir)/testsuite/mkosi/mkosi.cache
-       $(MKOSI) -C $(top_srcdir)/testsuite/mkosi --build-sources ../../ --default mkosi.${DISTRO} -fi