build-sys: create symlinks instead of building separate tools

diff --git a/Makefile.am b/Makefile.am
index 8bbe025..1e061a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,25 +94,11 @@ install-exec-hook:
 uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libkmod.so*
 
-noinst_PROGRAMS =
-
 if BUILD_TOOLS
 bin_PROGRAMS = tools/kmod
 
-noinst_PROGRAMS += tools/kmod-insmod tools/kmod-rmmod tools/kmod-lsmod \
-                  tools/kmod-modprobe tools/kmod-modinfo tools/kmod-depmod
-
-tools_kmod_insmod_LDADD = libkmod/libkmod.la
-tools_kmod_rmmod_LDADD = libkmod/libkmod.la
-tools_kmod_lsmod_LDADD = libkmod/libkmod.la
-tools_kmod_modprobe_LDADD = libkmod/libkmod.la
-tools_kmod_modinfo_LDADD = libkmod/libkmod.la
-
-tools_kmod_depmod_LDADD = libkmod/libkmod-util.la \
-                         libkmod/libkmod.la
-tools_kmod_depmod_CFLAGS = $(AM_CFLAGS)
-tools_kmod_depmod_CPPFLAGS = $(AM_CPPFLAGS)
-tools_kmod_depmod_LDFLAGS = $(AM_LDFLAGS)
+noinst_SCRIPTS = tools/insmod tools/rmmod tools/lsmod \
+                tools/modprobe tools/modinfo tools/depmod
 
 tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/kmod-lsmod.c \
                     tools/kmod-rmmod.c tools/kmod-insmod.c \
@@ -122,18 +108,22 @@ tools_kmod_CPPFLAGS = $(AM_CPPFLAGS) -DKMOD_BUNDLE_TOOL=1
 tools_kmod_CFLAGS = $(AM_CFLAGS)
 tools_kmod_LDADD = libkmod/libkmod-util.la \
                   libkmod/libkmod.la
+
+${noinst_SCRIPTS}: tools/kmod
+       $(AM_V_GEN) ($(RM) $@; \
+               $(LN_S) $(notdir $<) $@)
 endif
 
 check_PROGRAMS = test/test-init test/test-loaded
 test_test_init_LDADD = libkmod/libkmod.la
 test_test_loaded_LDADD = libkmod/libkmod.la
 
-noinst_PROGRAMS += test/test-insmod test/test-rmmod test/test-rmmod2 \
-                  test/test-lookup test/test-path-from-name \
-                  test/test-get-dependencies test/test-mod-double-ref \
-                  test/test-blacklist test/test-elf test/test-probe \
-                  test/test-invalidate-config \
-                  $(check_PROGRAMS)
+noinst_PROGRAMS = test/test-insmod test/test-rmmod test/test-rmmod2 \
+                 test/test-lookup test/test-path-from-name \
+                 test/test-get-dependencies test/test-mod-double-ref \
+                 test/test-blacklist test/test-elf test/test-probe \
+                 test/test-invalidate-config \
+                 $(check_PROGRAMS)
 
 test_test_rmmod_LDADD = libkmod/libkmod.la
 test_test_rmmod2_LDADD = libkmod/libkmod.la

diff --git a/tools/.gitignore b/tools/.gitignore
index f7c143a..8978adb 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,8 +1,8 @@
 .dirstamp
-kmod-insmod
-kmod-rmmod
-kmod-lsmod
-kmod-modprobe
-kmod-modinfo
-kmod-depmod
+insmod
+rmmod
+lsmod
+modprobe
+modinfo
+depmod
 kmod