build-sys: convert schedutils/ to module

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 138da8eb6389d207b8b02f5bfea0cb44f518944e..8e9171a618232c8c82e5e306ba265a796f1e90ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/config/include-Makefile.am
 
 dist_noinst_HEADERS =
 noinst_PROGRAMS =
+usrbin_exec_PROGRAMS =
+dist_man_MANS =
 
 SHLIBS_DIRS =
 
@@ -49,9 +51,6 @@ if BUILD_MOUNT
 SUBDIRS += mount
 endif
 
-if BUILD_SCHEDUTILS
-SUBDIRS += schedutils
-endif
 
 AUTOMAKE_OPTIONS = gnu
 ACLOCAL_AMFLAGS = -I m4
@@ -66,6 +65,7 @@ EXTRA_DIST = \
 
 include include/Makemodule.am
 include lib/Makemodule.am
+include schedutils/Makemodule.am
 
 
 # Arrange so that .tarball-version appears only in the distribution

diff --git a/configure.ac b/configure.ac
index dc25684c25b38ab4386e660b197c9082670d5717..0b659f2272fc7f8576766e2f9ff8cef948efa664 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1331,7 +1331,6 @@ misc-utils/uuidd.service
 mount/Makefile
 partx/Makefile
 po/Makefile.in
-schedutils/Makefile
 sys-utils/Makefile
 term-utils/Makefile
 tests/Makefile

diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am
deleted file mode 100644 (file)
index e068d46..0000000
--- a/schedutils/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-srcs_common = $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/procutils.c
-
-usrbin_exec_PROGRAMS = chrt
-dist_man_MANS = chrt.1
-
-chrt_SOURCES = chrt.c $(srcs_common)
-
-if BUILD_IONICE
-usrbin_exec_PROGRAMS += ionice
-ionice_SOURCES = ionice.c $(srcs_common)
-dist_man_MANS += ionice.1
-endif
-
-if BUILD_TASKSET
-usrbin_exec_PROGRAMS += taskset
-taskset_SOURCES = \
-       taskset.c \
-       $(top_srcdir)/lib/cpuset.c \
-       $(srcs_common)
-dist_man_MANS += taskset.1
-endif

diff --git a/schedutils/Makemodule.am b/schedutils/Makemodule.am
new file mode 100644 (file)
index 0000000..060eba1
--- /dev/null
+++ b/schedutils/Makemodule.am
@@ -0,0 +1,33 @@
+if BUILD_SCHEDUTILS
+
+usrbin_exec_PROGRAMS += chrt
+dist_man_MANS += schedutils/chrt.1
+
+sched_common = \
+       lib/strutils.c \
+       lib/procutils.c
+
+chrt_SOURCES = \
+       schedutils/chrt.c \
+       $(sched_common)
+
+if BUILD_IONICE
+usrbin_exec_PROGRAMS += ionice
+ionice_SOURCES = \
+       schedutils/ionice.c \
+       $(sched_common)
+
+dist_man_MANS += schedutils/ionice.1
+endif
+
+if BUILD_TASKSET
+usrbin_exec_PROGRAMS += taskset
+taskset_SOURCES = \
+       schedutils/taskset.c \
+       lib/cpuset.c \
+       $(sched_common)
+
+dist_man_MANS += schedutils/taskset.1
+endif
+
+endif # BUILD_SCHEDUTILS