From 545149a2fc3523bbcbf3703fae3ae1ca5312f8c8 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Fri, 18 Jul 2014 17:26:23 +0200 Subject: [PATCH] terminal: only build if --enable-terminal was specified Whoopsy, I totally forgot adding the "if ENABLE_TERMINAL" markers. Do that now that we know it builds fine everywhere. --- Makefile.am | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0615f663c..012e2e990 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2831,9 +2831,18 @@ tests += \ test-dhcp6-client # ------------------------------------------------------------------------------ +if ENABLE_TERMINAL noinst_LTLIBRARIES += \ libsystemd-terminal.la +noinst_PROGRAMS += \ + systemd-subterm + +tests += \ + test-term-page \ + test-term-parser +endif + libsystemd_terminal_la_CFLAGS = \ $(AM_CFLAGS) @@ -2849,9 +2858,6 @@ libsystemd_terminal_la_LIBADD = \ libsystemd-internal.la \ libsystemd-shared.la -noinst_PROGRAMS += \ - systemd-subterm - systemd_subterm_SOURCES = \ src/libsystemd-terminal/subterm.c @@ -2876,10 +2882,6 @@ test_term_parser_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -tests += \ - test-term-page \ - test-term-parser - # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC SUBDIRS += \ -- 2.30.2