wipefs: add --lock and LOCK_BLOCK_DEVICE

[thirdparty/util-linux.git] / text-utils / Makemodule.am

diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index ff9fb51baba46e5bfb887209e26a40111156e4b8..6c4b5208260d2fff5af3fdebc3fc66e7a265243f 100644 (file)
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -1,45 +1,48 @@
-
-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
+column_LDADD = $(LDADD) libcommon.la libsmartcols.la
+column_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+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 \
        text-utils/hexdump.c \
        text-utils/hexdump.h \
        text-utils/hexdump-parse.c
-hexdump_LDADD = $(LDADD) libcommon.la
+hexdump_LDADD = $(LDADD) libcommon.la libtcolors.la
+endif
 
+if BUILD_REV
+usrbin_exec_PROGRAMS += rev
+dist_man_MANS += text-utils/rev.1
 rev_SOURCES = text-utils/rev.c
-
-tailf_SOURCES = text-utils/tailf.c
-tailf_LDADD = $(LDADD) libcommon.la
+endif
 
 if BUILD_LINE
 usrbin_exec_PROGRAMS += line
@@ -47,7 +50,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
@@ -78,7 +80,7 @@ bin_PROGRAMS += more
 dist_man_MANS += text-utils/more.1
 more_SOURCES = text-utils/more.c
 more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS)
-more_LDADD = $(LDADD)
+more_LDADD = $(LDADD) $(MAGIC_LIBS) libcommon.la
 if HAVE_TINFO
 more_LDADD += $(TINFO_LIBS)
 more_LDADD += $(TINFO_CFLAGS)
@@ -87,13 +89,9 @@ more_CFLAGS += $(NCURSES_CFLAGS)
 more_LDADD += $(NCURSES_LIBS)
 endif
 
-if HAVE_TERMCAP
-more_LDADD += -ltermcap
-endif
-
 check_PROGRAMS += test_more
 test_more_SOURCES = $(more_SOURCES)
-test_more_CFLAGS = -DTEST_PROGRAM
+test_more_CFLAGS = -DTEST_PROGRAM $(more_CFLAGS)
 test_more_LDADD = $(more_LDADD)
 
 endif # BUILD_MORE