Remove ifdef for building tools not bundled

Current build system do not support to build separate tools anymore, so
just remove the ifdefs.

diff --git a/Makefile.am b/Makefile.am
index 570a623cb186f5b68fc127ef0c184ecb93a07c21..7bfa8f1cbd5255b0a187198907f8021e9af06f11 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,15 +106,11 @@ 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_kmod_CPPFLAGS = $(AM_CPPFLAGS) -DKMOD_BUNDLE_TOOL=1
-tools_kmod_CFLAGS = $(AM_CFLAGS)
 tools_kmod_LDADD = libkmod/libkmod-util.la \
                   libkmod/libkmod.la
 
 noinst_PROGRAMS = tools/kmod-nolib
 tools_kmod_nolib_SOURCES = $(tools_kmod_SOURCES)
-tools_kmod_nolib_CPPFLAGS = $(tools_kmod_CPPFLAGS)
-tools_kmod_nolib_CFLAGS = $(tools_kmod_CFLAGS)
 tools_kmod_nolib_LDADD = libkmod/libkmod-util.la \
                         libkmod/libkmod-private.la
 

diff --git a/tools/depmod.c b/tools/depmod.c
index bceb40757c22d2fc5f4414b07cd609e6424cefbb..9c51c6ef13ca52e848075717ead6b2c98545efdf 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2759,13 +2759,6 @@ cmdline_failed:
        return EXIT_FAILURE;
 }
 
-#ifndef KMOD_BUNDLE_TOOL
-int main(int argc, char *argv[])
-{
-       return do_depmod(argc, argv);
-}
-
-#else
 #include "kmod.h"
 
 const struct kmod_cmd kmod_cmd_compat_depmod = {
@@ -2773,5 +2766,3 @@ const struct kmod_cmd kmod_cmd_compat_depmod = {
        .cmd = do_depmod,
        .help = "compat depmod command",
 };
-
-#endif

diff --git a/tools/insmod.c b/tools/insmod.c
index 4459cc0887c4d829414f1ddc6143a0cdf23a6508..4eb81103089be80425b03f31cff655acb4047a2b 100644 (file)
--- a/tools/insmod.c
+++ b/tools/insmod.c
@@ -153,13 +153,6 @@ end:
        return err >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-#ifndef KMOD_BUNDLE_TOOL
-int main(int argc, char *argv[])
-{
-       return do_insmod(argc, argv);
-}
-
-#else
 #include "kmod.h"
 
 const struct kmod_cmd kmod_cmd_compat_insmod = {
@@ -167,5 +160,3 @@ const struct kmod_cmd kmod_cmd_compat_insmod = {
        .cmd = do_insmod,
        .help = "compat insmod command",
 };
-
-#endif

diff --git a/tools/lsmod.c b/tools/lsmod.c
index ad66b754175b9c625a54f82047ffbd4706a27662..96b340db07b289f82ef3c0305cf7c73695995aee 100644 (file)
--- a/tools/lsmod.c
+++ b/tools/lsmod.c
@@ -85,13 +85,6 @@ static int do_lsmod(int argc, char *argv[])
        return EXIT_SUCCESS;
 }
 
-#ifndef KMOD_BUNDLE_TOOL
-int main(int argc, char *argv[])
-{
-       return do_lsmod(argc, argv);
-}
-
-#else
 #include "kmod.h"
 
 const struct kmod_cmd kmod_cmd_compat_lsmod = {
@@ -105,5 +98,3 @@ const struct kmod_cmd kmod_cmd_list = {
        .cmd = do_lsmod,
        .help = "list currently loaded modules",
 };
-
-#endif

diff --git a/tools/modinfo.c b/tools/modinfo.c
index aa5223fed4e9530f0bc1a523c44d10ccdcf0fe19..b506f10e79a8bd53700006bcf04739d18a02f628 100644 (file)
--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -468,13 +468,6 @@ static int do_modinfo(int argc, char *argv[])
        return err >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-#ifndef KMOD_BUNDLE_TOOL
-int main(int argc, char *argv[])
-{
-       return do_modinfo(argc, argv);
-}
-
-#else
 #include "kmod.h"
 
 const struct kmod_cmd kmod_cmd_compat_modinfo = {
@@ -482,5 +475,3 @@ const struct kmod_cmd kmod_cmd_compat_modinfo = {
        .cmd = do_modinfo,
        .help = "compat modinfo command",
 };
-
-#endif

diff --git a/tools/modprobe.c b/tools/modprobe.c
index 26b77133249e8df1a096ae37775a960161436db0..f8a2805f685e5d1e60cbfc72d79a656cc079bb6e 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -1031,13 +1031,6 @@ cmdline_failed:
        return EXIT_FAILURE;
 }
 
-#ifndef KMOD_BUNDLE_TOOL
-int main(int argc, char *argv[])
-{
-       return do_modprobe(argc, argv);
-}
-
-#else
 #include "kmod.h"
 
 const struct kmod_cmd kmod_cmd_compat_modprobe = {
@@ -1045,5 +1038,3 @@ const struct kmod_cmd kmod_cmd_compat_modprobe = {
        .cmd = do_modprobe,
        .help = "compat modprobe command",
 };
-
-#endif

diff --git a/tools/rmmod.c b/tools/rmmod.c
index 33a73ca324348d36d369ebd5fe00ec996cee82b1..0aa6fb6f28b2ac9d3a2a3389c97e287a7c501054 100644 (file)
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -236,13 +236,6 @@ next:
        return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-#ifndef KMOD_BUNDLE_TOOL
-int main(int argc, char *argv[])
-{
-       return do_rmmod(argc, argv);
-}
-
-#else
 #include "kmod.h"
 
 const struct kmod_cmd kmod_cmd_compat_rmmod = {
@@ -250,5 +243,3 @@ const struct kmod_cmd kmod_cmd_compat_rmmod = {
        .cmd = do_rmmod,
        .help = "compat rmmod command",
 };
-
-#endif