From 58a111bdb27623780208c7d5691298a42b9d88b5 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 20 Jun 2011 13:51:26 +0200 Subject: [PATCH] build-sys: move BUILD_SCHEDUTILS to top-level Makefile Signed-off-by: Karel Zak --- Makefile.am | 5 ++++- schedutils/Makefile.am | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 01a28bb7e..b016bbdf5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,6 @@ SUBDIRS = \ login-utils \ misc-utils \ po \ - schedutils \ sys-utils \ term-utils \ text-utils \ @@ -53,6 +52,10 @@ if BUILD_FSCK SUBDIRS += fsck endif +if BUILD_SCHEDUTILS +SUBDIRS += schedutils +endif + AUTOMAKE_OPTIONS = gnu ACLOCAL_AMFLAGS = -I m4 diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am index 91dc9054d..a2bb0b322 100644 --- a/schedutils/Makefile.am +++ b/schedutils/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/include-Makefile.am -if BUILD_SCHEDUTILS - srcs_common = $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/procutils.c usrbin_exec_PROGRAMS = chrt @@ -22,5 +20,3 @@ usrbin_exec_PROGRAMS += taskset taskset_SOURCES = taskset.c $(top_srcdir)/lib/cpuset.c $(srcs_common) dist_man_MANS += taskset.1 endif - -endif