Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 2 +- configure.ac | 1 - schedutils/Makefile.am | 21 --------------------- schedutils/module.am | 19 +++++++++++++++++++ 4 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 schedutils/Makefile.am create mode 100644 schedutils/module.am diff --git a/Makefile.am b/Makefile.am index d9db739..3033570 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,7 +49,6 @@ endif SUBDIRS = \ $(SHLIBS_DIRS) \ po \ - schedutils \ sys-utils \ text-utils @@ -108,6 +107,7 @@ include getopt/module.am include hwclock/module.am include login-utils/module.am include misc-utils/module.am +include schedutils/module.am clean-local: rm -rf tests/output tests/diff diff --git a/configure.ac b/configure.ac index d8dfd9f..7af649f 100644 --- a/configure.ac +++ b/configure.ac @@ -1136,7 +1136,6 @@ Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl mount/Makefile po/Makefile.in -schedutils/Makefile shlibs/blkid/blkid.pc shlibs/blkid/Makefile shlibs/blkid/docs/Makefile diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am deleted file mode 100644 index 13d45c8..0000000 --- a/schedutils/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -if BUILD_SCHEDUTILS - -usrbin_exec_PROGRAMS = chrt -dist_man_MANS = chrt.1 - -if HAVE_IOPRIO_GET -if HAVE_IOPRIO_SET -usrbin_exec_PROGRAMS += ionice -dist_man_MANS += ionice.1 -endif -endif - -if HAVE_SCHED_GETAFFINITY -usrbin_exec_PROGRAMS += taskset -taskset_SOURCES = taskset.c $(top_srcdir)/lib/cpuset.c -dist_man_MANS += taskset.1 -endif - -endif diff --git a/schedutils/module.am b/schedutils/module.am new file mode 100644 index 0000000..b57e9a3 --- /dev/null +++ b/schedutils/module.am @@ -0,0 +1,19 @@ +if BUILD_SCHEDUTILS + +usrbin_exec_PROGRAMS += schedutils/chrt +dist_man_MANS += schedutils/chrt.1 + +if HAVE_IOPRIO_GET +if HAVE_IOPRIO_SET +usrbin_exec_PROGRAMS += schedutils/ionice +dist_man_MANS += schedutils/ionice.1 +endif +endif + +if HAVE_SCHED_GETAFFINITY +usrbin_exec_PROGRAMS += schedutils/taskset +schedutils_taskset_SOURCES = schedutils/taskset.c lib/cpuset.c +dist_man_MANS += schedutils/taskset.1 +endif + +endif -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html