Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 4 ++-- configure.ac | 1 - text-utils/Makefile.am | 33 --------------------------------- text-utils/module.am | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 text-utils/Makefile.am create mode 100644 text-utils/module.am diff --git a/Makefile.am b/Makefile.am index 3033570..c167fc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,8 +49,7 @@ endif SUBDIRS = \ $(SHLIBS_DIRS) \ po \ - sys-utils \ - text-utils + sys-utils RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o @@ -108,6 +107,7 @@ include hwclock/module.am include login-utils/module.am include misc-utils/module.am include schedutils/module.am +include text-utils/module.am clean-local: rm -rf tests/output tests/diff diff --git a/configure.ac b/configure.ac index 7af649f..fb71974 100644 --- a/configure.ac +++ b/configure.ac @@ -1158,7 +1158,6 @@ shlibs/uuid/man/Makefile shlibs/uuid/src/Makefile sys-utils/Makefile tests/commands.sh -text-utils/Makefile ]) diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am deleted file mode 100644 index dec895b..0000000 --- a/text-utils/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -EXTRA_DIST = README.clear README.col - -usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev line tailf - -hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c \ - hexdump.h - -dist_man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1 - -if HAVE_NCURSES -bin_PROGRAMS = more -usrbin_exec_PROGRAMS += ul pg -if HAVE_TINFO -more_LDADD = -ltinfo -pg_LDADD = -ltinfo @NCURSES_LIBS@ -ul_LDADD = -ltinfo -else -more_LDADD = @NCURSES_LIBS@ -pg_LDADD = @NCURSES_LIBS@ -ul_LDADD = @NCURSES_LIBS@ -endif -dist_man_MANS += ul.1 more.1 pg.1 -else -if HAVE_TERMCAP -bin_PROGRAMS = more -more_LDADD = -ltermcap -dist_man_MANS += more.1 -endif -endif - -EXTRA_DIST += README.pg LICENSE.pg diff --git a/text-utils/module.am b/text-utils/module.am new file mode 100644 index 0000000..3543f09 --- /dev/null +++ b/text-utils/module.am @@ -0,0 +1,39 @@ +EXTRA_DIST += text-utils/README.clear text-utils/README.col + +usrbin_exec_PROGRAMS += text-utils/col text-utils/colcrt \ + text-utils/colrm text-utils/column \ + text-utils/hexdump text-utils/rev \ + text-utils/line text-utils/tailf + +text_utils_hexdump_SOURCES = text-utils/hexdump.c text-utils/conv.c \ + text-utils/display.c text-utils/hexsyntax.c \ + text-utils/odsyntax.c text-utils/parse.c \ + text-utils/hexdump.h + +dist_man_MANS += text-utils/col.1 text-utils/colcrt.1 \ + text-utils/colrm.1 text-utils/column.1 \ + text-utils/hexdump.1 text-utils/rev.1 \ + text-utils/line.1 text-utils/tailf.1 + +if HAVE_NCURSES +bin_PROGRAMS += text-utils/more +usrbin_exec_PROGRAMS += text-utils/ul text-utils/pg +if HAVE_TINFO +text_utils_more_LDADD = -ltinfo +text_utils_pg_LDADD = -ltinfo $(NCURSES_LIBS) +text_utils_ul_LDADD = -ltinfo +else +text_utils_more_LDADD = $(NCURSES_LIBS) +text_utils_pg_LDADD = $(NCURSES_LIBS) +text_utils_ul_LDADD = $(NCURSES_LIBS) +endif +dist_man_MANS += text-utils/ul.1 text-utils/more.1 text-utils/pg.1 +else +if HAVE_TERMCAP +bin_PROGRAMS += text-utils/more +text_utils_more_LDADD = -ltermcap +dist_man_MANS += text-utils/more.1 +endif +endif + +EXTRA_DIST += text-utils/README.pg text-utils/LICENSE.pg -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
