journalctl: strip TABs and ANSI color sequences from log messages when displaying...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f8fe2529ab92d41ff75567d576baba98462f784e..65055b3fba7450842f1c47ccdaae42f38f2f7a0a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -422,11 +422,6 @@ systemgenerator_PROGRAMS += \
        systemd-rc-local-generator
 endif
 
-if TARGET_FRUGALWARE
-dist_systemunit_DATA += \
-       units/frugalware/display-manager.service
-endif
-
 if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/rc-local.service \
@@ -1237,7 +1232,8 @@ noinst_PROGRAMS += \
        test-sleep \
        test-replace-var \
        test-sched-prio \
-       test-calendarspec
+       test-calendarspec \
+       test-strip-tab-ansi
 
 TESTS += \
        test-job-type \
@@ -1249,7 +1245,8 @@ TESTS += \
        test-sleep \
        test-replace-var \
        test-sched-prio \
-       test-calendarspec
+       test-calendarspec \
+       test-strip-tab-ansi
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1346,6 +1343,12 @@ test_calendarspec_SOURCES = \
 test_calendarspec_LDADD = \
        libsystemd-shared.la
 
+test_strip_tab_ansi_SOURCES = \
+       src/test/test-strip-tab-ansi.c
+
+test_strip_tab_ansi_LDADD = \
+       libsystemd-shared.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1667,7 +1670,9 @@ systemd_nspawn_SOURCES = \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
-       src/core/loopback-setup.h
+       src/core/loopback-setup.h \
+       src/core/fdset.c \
+       src/core/fdset.h
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \