From: Karel Zak <kzak@redhat.com>
Date: Wed, 21 May 2014 12:09:43 +0000 (+0200)
Subject: build-sys: add BUILD_{COL,COLCRT,COLRM,COLUMN,HEXDUMP,REV,TAILF}
X-Git-Tag: v2.25-rc1~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb45354ec6a34d13c8bde58385f07c5f3fd847aa;p=thirdparty%2Futil-linux.git

build-sys: add BUILD_{COL,COLCRT,COLRM,COLUMN,HEXDUMP,REV,TAILF}

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 8622408a17..f4a4b9cd13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1236,6 +1236,27 @@ AM_CONDITIONAL([BUILD_SCRIPT], [test "x$build_script" = xyes])
 UL_BUILD_INIT([scriptreplay], [yes])
 AM_CONDITIONAL([BUILD_SCRIPTREPLAY], [test "x$build_scriptreplay" = xyes])
 
+UL_BUILD_INIT([col], [yes])
+AM_CONDITIONAL([BUILD_COL], [test "x$build_col" = xyes])
+
+UL_BUILD_INIT([colcrt], [yes])
+AM_CONDITIONAL([BUILD_COLCRT], [test "x$build_colcrt" = xyes])
+
+UL_BUILD_INIT([colrm], [yes])
+AM_CONDITIONAL([BUILD_COLRM], [test "x$build_colrm" = xyes])
+
+UL_BUILD_INIT([column], [yes])
+AM_CONDITIONAL([BUILD_COLUMN], [test "x$build_column" = xyes])
+
+UL_BUILD_INIT([hexdump], [yes])
+AM_CONDITIONAL([BUILD_HEXDUMP], [test "x$build_hexdump" = xyes])
+
+UL_BUILD_INIT([rev], [yes])
+AM_CONDITIONAL([BUILD_REV], [test "x$build_rev" = xyes])
+
+UL_BUILD_INIT([tailf], [yes])
+AM_CONDITIONAL([BUILD_TAILF], [test "x$build_tailf" = xyes])
+
 
 AC_ARG_ENABLE([tunelp],
   AS_HELP_STRING([--enable-tunelp], [build tunelp]),
diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index ff9fb51bab..bd3d53f822 100644
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -1,33 +1,33 @@
-
-usrbin_exec_PROGRAMS += \
-	col \
-	colcrt \
-	colrm \
-	column \
-	hexdump \
-	rev \
-	tailf
-
-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/tailf.1
-
+if BUILD_COL
+usrbin_exec_PROGRAMS += col
+dist_man_MANS += text-utils/col.1
 col_SOURCES = text-utils/col.c
 col_LDADD = $(LDADD) libcommon.la
+endif
 
+if BUILD_COLCRT
+usrbin_exec_PROGRAMS += colcrt
+dist_man_MANS += text-utils/colcrt.1
 colcrt_SOURCES = text-utils/colcrt.c
+endif
 
+if BUILD_COLRM
+usrbin_exec_PROGRAMS += colrm
+dist_man_MANS += text-utils/colrm.1
 colrm_SOURCES = text-utils/colrm.c
 colrm_LDADD = $(LDADD) libcommon.la
+endif
 
+if BUILD_COLUMN
+usrbin_exec_PROGRAMS += column
+dist_man_MANS += text-utils/column.1
 column_SOURCES = text-utils/column.c
 column_LDADD = $(LDADD) libcommon.la
+endif
 
+if BUILD_HEXDUMP
+usrbin_exec_PROGRAMS += hexdump
+dist_man_MANS += text-utils/hexdump.1
 hexdump_SOURCES = \
 	text-utils/hexdump-conv.c \
 	text-utils/hexdump-display.c \
@@ -35,11 +35,20 @@ hexdump_SOURCES = \
 	text-utils/hexdump.h \
 	text-utils/hexdump-parse.c
 hexdump_LDADD = $(LDADD) libcommon.la
+endif
 
+if BUILD_REV
+usrbin_exec_PROGRAMS += rev
+dist_man_MANS += text-utils/rev.1
 rev_SOURCES = text-utils/rev.c
+endif
 
+if BUILD_TAILF
+usrbin_exec_PROGRAMS += tailf
+dist_man_MANS += text-utils/tailf.1
 tailf_SOURCES = text-utils/tailf.c
 tailf_LDADD = $(LDADD) libcommon.la
+endif
 
 if BUILD_LINE
 usrbin_exec_PROGRAMS += line
@@ -47,7 +56,6 @@ line_SOURCES = text-utils/line.c
 dist_man_MANS += text-utils/line.1
 endif
 
-
 if BUILD_PG
 usrbin_exec_PROGRAMS += pg
 dist_man_MANS += text-utils/pg.1