X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=65055b3fba7450842f1c47ccdaae42f38f2f7a0a;hb=e8bc0ea2b100158bf35c635039226235aa879068;hp=bafd4734cca150b219434890af8069215973c143;hpb=5fe25affc01fb003a3a66937458a25640a6075ce;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index bafd4734c..65055b3fb 100644
--- 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 \
@@ -1115,6 +1110,7 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-dbus.la \
 	libsystemd-audit.la \
 	libsystemd-id128-internal.la \
+	libsystemd-daemon.la \
 	libudev.la \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
@@ -1236,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 \
@@ -1248,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 \
@@ -1345,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
 
@@ -1666,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 \