summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-07-18 17:26:23 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2014-07-18 17:45:33 +0200
commit545149a2fc3523bbcbf3703fae3ae1ca5312f8c8 (patch)
tree120ca7270db85d5c7bcae045f99a052884b760da /Makefile.am
parent46f08bea4b09e2cce4b50e3c082df4a92a22598c (diff)
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am16
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 0615f663ce..012e2e9905 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 += \