X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fkmod.git;a=blobdiff_plain;f=Makefile.am;h=c5c2f06f6d558c49a10668a431f984d06f2b724c;hp=8ba85c91a0f39376c5c9cd7cc7190fb3059cd6a6;hb=HEAD;hpb=e4c1a5b2998bc2c9dbcff8d62f121d1f8f5f4fe5 diff --git a/Makefile.am b/Makefile.am index 8ba85c9..e2e2411 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -I$(top_srcdir) \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DDISTCONFDIR=\""$(distconfdir)"\" \ + -DMODULE_DIRECTORY=\""$(module_directory)"\" \ ${zlib_CFLAGS} AM_CFLAGS = $(OUR_CFLAGS) @@ -38,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=0 +LIBKMOD_REVISION=2 LIBKMOD_AGE=4 noinst_LTLIBRARIES = shared/libshared.la @@ -94,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 +noarch_pkgconfig_DATA = tools/kmod.pc bashcompletiondir=@bashcompletiondir@ dist_bashcompletion_DATA = \ @@ -109,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 @@ -127,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 @@ -142,74 +148,6 @@ ${noinst_SCRIPTS}: tools/kmod $(LN_S) $(notdir $<) $@) endif -# ------------------------------------------------------------------------------ -# PYTHON BINDINGS -# ------------------------------------------------------------------------------ - -CYTHON_FLAGS_VERBOSE_ = -CYTHON_FLAGS_VERBOSE_0 = -CYTHON_FLAGS_VERBOSE_1 = -v -CYTHON_FLAGS = $(CYTHON_FLAGS_VERBOSE_$(V)) -AM_V_CYTHON = $(am__v_CYTHON_$(V)) -am__v_CYTHON_ = $(am__v_CYTHON_$(AM_DEFAULT_VERBOSITY)) -am__v_CYTHON_0 = @echo " CYTHON " $@; - -.pyx.c: - $(AM_V_CYTHON)$(CYTHON) -o $@ $< - -# Remove some warnings for generated code -PYTHON_NOWARN = -Wno-redundant-decls -Wno-shadow -Wno-strict-aliasing - -CPYTHON_MODULE_CFLAGS = \ - $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ - $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ - -fvisibility=default -# Filter -Wl,--no-undefined to fix build with python 3.8 -comma = , -CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS)) -CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared - -if BUILD_PYTHON -pkgpyexec_LTLIBRARIES = \ - libkmod/python/kmod/kmod.la \ - libkmod/python/kmod/list.la \ - libkmod/python/kmod/module.la \ - libkmod/python/kmod/_util.la - -libkmod_python_kmod_kmod_la_SOURCES = libkmod/python/kmod/kmod.c -libkmod_python_kmod_kmod_la_CFLAGS = $(CPYTHON_MODULE_CFLAGS) -libkmod_python_kmod_kmod_la_LDFLAGS = $(CPYTHON_MODULE_LDFLAGS) -libkmod_python_kmod_kmod_la_LIBADD = $(PYTHON_LIBS) libkmod/libkmod.la - -libkmod_python_kmod_list_la_SOURCES = libkmod/python/kmod/list.c -libkmod_python_kmod_list_la_CFLAGS = $(CPYTHON_MODULE_CFLAGS) -libkmod_python_kmod_list_la_LDFLAGS = $(CPYTHON_MODULE_LDFLAGS) -libkmod_python_kmod_list_la_LIBADD = $(PYTHON_LIBS) libkmod/libkmod.la - -libkmod_python_kmod_module_la_SOURCES = libkmod/python/kmod/module.c -libkmod_python_kmod_module_la_CFLAGS = $(CPYTHON_MODULE_CFLAGS) -libkmod_python_kmod_module_la_LDFLAGS = $(CPYTHON_MODULE_LDFLAGS) -libkmod_python_kmod_module_la_LIBADD = $(PYTHON_LIBS) libkmod/libkmod.la - -libkmod_python_kmod__util_la_SOURCES = libkmod/python/kmod/_util.c -libkmod_python_kmod__util_la_CFLAGS = $(CPYTHON_MODULE_CFLAGS) -libkmod_python_kmod__util_la_LDFLAGS = $(CPYTHON_MODULE_LDFLAGS) -libkmod_python_kmod__util_la_LIBADD = $(PYTHON_LIBS) libkmod/libkmod.la - -BUILT_FILES += \ - $(libkmod_python_kmod_kmod_la_SOURCES) \ - $(libkmod_python_kmod_list_la_SOURCES) \ - $(libkmod_python_kmod_module_la_SOURCES) \ - $(libkmod_python_kmod__util_la_SOURCES) - -dist_pkgpyexec_PYTHON = \ - libkmod/python/kmod/error.py \ - libkmod/python/kmod/__init__.py \ - libkmod/python/kmod/version.py - -BUILT_FILES += libkmod/python/kmod/version.py - -endif # ------------------------------------------------------------------------------ # TESTSUITE # ------------------------------------------------------------------------------ @@ -219,7 +157,7 @@ EXTRA_DIST += testsuite/setup-rootfs.sh MODULE_PLAYGROUND = testsuite/module-playground ROOTFS = testsuite/rootfs ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine -CREATE_ROOTFS = $(AM_V_GEN) $(top_srcdir)/testsuite/setup-rootfs.sh $(ROOTFS_PRISTINE) $(ROOTFS) $(MODULE_PLAYGROUND) $(top_builddir)/config.h $(sysconfdir) +CREATE_ROOTFS = $(AM_V_GEN) MODULE_DIRECTORY=$(module_directory) $(top_srcdir)/testsuite/setup-rootfs.sh $(ROOTFS_PRISTINE) $(ROOTFS) $(MODULE_PLAYGROUND) $(top_builddir)/config.h $(sysconfdir) build-module-playground: $(AM_V_GEN)if test "$(top_srcdir)" != "$(top_builddir)"; then \ @@ -326,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) @@ -373,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 @@ -389,7 +317,7 @@ testsuite-distclean: DISTCLEAN_LOCAL_HOOKS += testsuite-distclean EXTRA_DIST += testsuite/rootfs-pristine -DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-python --sysconfdir=/etc \ +DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc \ --with-zlib --with-zstd --with-openssl \ --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) @@ -443,7 +371,7 @@ endif kmod-coverity-%.tar.xz: rm -rf $< cov-int - ./autogen.sh c --disable-python --disable-manpages + ./autogen.sh c --disable-manpages make clean cov-build --dir cov-int make -j 4 tar caf $@ cov-int @@ -482,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