diff options
| author | Karel Zak | 2012-05-22 15:57:23 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-06-26 17:25:24 +0200 |
| commit | 5ed5df5d6eed64bbec6fd8853713fff3506be8ab (patch) | |
| tree | 9ad1d89ad2cdb4e9a93c215c0186795befeddf3f | |
| parent | build-sys: define per-test -DTEST_PROGRAM in lib/ (diff) | |
| download | kernel-qcow2-util-linux-5ed5df5d6eed64bbec6fd8853713fff3506be8ab.tar.gz kernel-qcow2-util-linux-5ed5df5d6eed64bbec6fd8853713fff3506be8ab.tar.xz kernel-qcow2-util-linux-5ed5df5d6eed64bbec6fd8853713fff3506be8ab.zip | |
build-sys: convert schedutils/ to module
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | schedutils/Makefile.am | 23 | ||||
| -rw-r--r-- | schedutils/Makemodule.am | 33 |
4 files changed, 36 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index 138da8eb6..8e9171a61 100644 --- 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 dc25684c2..0b659f227 100644 --- 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 index e068d4674..000000000 --- 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 index 000000000..060eba148 --- /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 |