diff options
| author | Karel Zak | 2011-03-02 14:06:23 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-03-02 14:06:23 +0100 |
| commit | c76d33baccc67b3719403c1b5220d5d57ec9e950 (patch) | |
| tree | 1815be3f863d3daa89a5b15ddcc00b6e6b778436 | |
| parent | build-sys: move setterm to term-utils/ (diff) | |
| download | kernel-qcow2-util-linux-c76d33baccc67b3719403c1b5220d5d57ec9e950.tar.gz kernel-qcow2-util-linux-c76d33baccc67b3719403c1b5220d5d57ec9e950.tar.xz kernel-qcow2-util-linux-c76d33baccc67b3719403c1b5220d5d57ec9e950.zip | |
build-sys: move script and scriptreplay to term-utils/
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | misc-utils/Makefile.am | 15 | ||||
| -rw-r--r-- | term-utils/Makefile.am | 15 | ||||
| -rw-r--r-- | term-utils/script.1 (renamed from misc-utils/script.1) | 0 | ||||
| -rw-r--r-- | term-utils/script.c (renamed from misc-utils/script.c) | 0 | ||||
| -rw-r--r-- | term-utils/scriptreplay.1 (renamed from misc-utils/scriptreplay.1) | 0 | ||||
| -rw-r--r-- | term-utils/scriptreplay.c (renamed from misc-utils/scriptreplay.c) | 0 |
6 files changed, 16 insertions, 14 deletions
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index d239024de..d7ee03ce5 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -6,19 +6,18 @@ bin_PROGRAMS = sbin_PROGRAMS = usrsbin_exec_PROGRAMS = -usrbin_exec_PROGRAMS = cal ddate logger look mcookie \ - namei script whereis scriptreplay +usrbin_exec_PROGRAMS = cal ddate logger look mcookie namei whereis + EXTRA_DIST += README.cal README.ddate README.namei README.namei2 mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c -script_LDADD = usrbin_exec_SCRIPTS = chkdupexe CLEANFILES = chkdupexe dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ - namei.1 script.1 whereis.1 scriptreplay.1 + namei.1 whereis.1 namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c @@ -98,14 +97,6 @@ endif endif endif -if HAVE_UTIL -script_LDADD += -lutil -endif - -if HAVE_UTEMPTER -script_LDADD += -lutempter -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 94d377b79..62342d832 100644 --- a/term-utils/Makefile.am +++ b/term-utils/Makefile.am @@ -1,13 +1,24 @@ include $(top_srcdir)/config/include-Makefile.am bin_PROGRAMS = -usrbin_exec_PROGRAMS = +usrbin_exec_PROGRAMS = script scriptreplay sbin_PROGRAMS = usrsbin_exec_PROGRAMS = -dist_man_MANS = + +dist_man_MANS = script.1 scriptreplay.1 EXTRA_DIST = README.modems-with-agetty +script_LDADD = + +if HAVE_UTIL +script_LDADD += -lutil +endif + +if HAVE_UTEMPTER +script_LDADD += -lutempter +endif + if BUILD_AGETTY sbin_PROGRAMS += agetty dist_man_MANS += agetty.8 diff --git a/misc-utils/script.1 b/term-utils/script.1 index f411dc6e7..f411dc6e7 100644 --- a/misc-utils/script.1 +++ b/term-utils/script.1 diff --git a/misc-utils/script.c b/term-utils/script.c index 788c4c4f4..788c4c4f4 100644 --- a/misc-utils/script.c +++ b/term-utils/script.c diff --git a/misc-utils/scriptreplay.1 b/term-utils/scriptreplay.1 index d102f0607..d102f0607 100644 --- a/misc-utils/scriptreplay.1 +++ b/term-utils/scriptreplay.1 diff --git a/misc-utils/scriptreplay.c b/term-utils/scriptreplay.c index 992e949f9..992e949f9 100644 --- a/misc-utils/scriptreplay.c +++ b/term-utils/scriptreplay.c |