summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2011-03-02 14:02:01 +0100
committerKarel Zak2011-03-02 14:02:01 +0100
commit8c59914ee2124569329952b1b492a6c14b4fc1ad (patch)
tree3454a385eb31aebe0c15be73cd76a5d3a91d8ca2
parentbuild-sys: move agetty to term-utils (diff)
downloadkernel-qcow2-util-linux-8c59914ee2124569329952b1b492a6c14b4fc1ad.tar.gz
kernel-qcow2-util-linux-8c59914ee2124569329952b1b492a6c14b4fc1ad.tar.xz
kernel-qcow2-util-linux-8c59914ee2124569329952b1b492a6c14b4fc1ad.zip
build-sys: move setterm to term-utils/
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--misc-utils/Makefile.am12
-rw-r--r--term-utils/Makefile.am13
-rw-r--r--term-utils/setterm.1 (renamed from misc-utils/setterm.1)0
-rw-r--r--term-utils/setterm.c (renamed from misc-utils/setterm.c)0
4 files changed, 13 insertions, 12 deletions
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index f58831765..d239024de 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -106,18 +106,6 @@ if HAVE_UTEMPTER
script_LDADD += -lutempter
endif
-if HAVE_NCURSES
-if LINUX
-usrbin_exec_PROGRAMS += setterm
-dist_man_MANS += setterm.1
-endif
-if HAVE_TINFO
-setterm_LDADD = -ltinfo
-else
-setterm_LDADD = @NCURSES_LIBS@
-endif
-endif
-
if BUILD_KILL
bin_PROGRAMS += kill
kill_SOURCES = kill.c procs.c kill.h $(top_srcdir)/lib/strutils.c
diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am
index a7459a0f2..94d377b79 100644
--- a/term-utils/Makefile.am
+++ b/term-utils/Makefile.am
@@ -16,3 +16,16 @@ if !HAVE_LANGINFO
agetty_SOURCES += $(top_srcdir)/lib/langinfo.c
endif
endif
+
+if HAVE_NCURSES
+if LINUX
+usrbin_exec_PROGRAMS += setterm
+dist_man_MANS += setterm.1
+endif
+if HAVE_TINFO
+setterm_LDADD = -ltinfo
+else
+setterm_LDADD = @NCURSES_LIBS@
+endif
+endif
+
diff --git a/misc-utils/setterm.1 b/term-utils/setterm.1
index ceff57ff5..ceff57ff5 100644
--- a/misc-utils/setterm.1
+++ b/term-utils/setterm.1
diff --git a/misc-utils/setterm.c b/term-utils/setterm.c
index 14b2c3df4..14b2c3df4 100644
--- a/misc-utils/setterm.c
+++ b/term-utils/setterm.c