diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:04:01 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:04:01 +0100 |
| commit | c5c1033c5c7deda8abe3448ec81bbb33c72219e0 (patch) | |
| tree | 6e5cef29b85161eea8a7488a029f5a32f982c6ab /text-utils/Makemodule.am | |
| parent | 462008f79be9e195670b202cb43827b8aeb1e60b (diff) | |
| parent | 2fb567c080e1762ec6a2147564f03068f55d4f14 (diff) | |
| download | util-linux-baserock/morph.tar.gz | |
Merge branch 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield
Diffstat (limited to 'text-utils/Makemodule.am')
| -rw-r--r-- | text-utils/Makemodule.am | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index d3ebfdc5b..970b452e9 100644 --- a/text-utils/Makemodule.am +++ b/text-utils/Makemodule.am @@ -53,11 +53,8 @@ if BUILD_PG usrbin_exec_PROGRAMS += pg dist_man_MANS += text-utils/pg.1 pg_SOURCES = text-utils/pg.c -pg_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) -pg_LDADD = $(LDADD) libcommon.la @NCURSES_LIBS@ -if HAVE_TINFO -pg_LDADD += -ltinfo -endif +pg_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) $(NCURSES_CFLAGS) $(TINFO_CFLAGS) +pg_LDADD = $(LDADD) libcommon.la $(NCURSES_LIBS) $(TINFO_LIBS) endif # BUILD_PG @@ -65,11 +62,14 @@ if BUILD_UL usrbin_exec_PROGRAMS += ul dist_man_MANS += text-utils/ul.1 ul_SOURCES = text-utils/ul.c +ul_CFLAGS = $(AM_CFLAGS) ul_LDADD = $(LDADD) if HAVE_TINFO -ul_LDADD += -ltinfo -else -ul_LDADD += @NCURSES_LIBS@ +ul_LDADD += $(TINFO_LIBS) +ul_LDADD += $(TINFO_CFLAGS) +else +ul_CFLAGS += $(NCURSES_CFLAGS) +ul_LDADD += $(NCURSES_LIBS) endif endif # BUILD_UL @@ -81,13 +81,15 @@ more_SOURCES = text-utils/more.c more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) more_LDADD = $(LDADD) if HAVE_TINFO -more_LDADD += -ltinfo -else -if HAVE_NCURSES -more_LDADD += @NCURSES_LIBS@ +more_LDADD += $(TINFO_LIBS) +more_LDADD += $(TINFO_CFLAGS) else -more_LDADD += -ltermcap +more_CFLAGS += $(NCURSES_CFLAGS) +more_LDADD += $(NCURSES_LIBS) endif + +if HAVE_TERMCAP +more_LDADD += -ltermcap endif check_PROGRAMS += test_more |