X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=477b3a6e89a2575328e4e61a62e4938deebf1ede;hb=485507b8c031e0c75f43c4b4fce5a0082a812fbb;hp=f77a1604930e2bde7e6b3023cfae01292feef8f3;hpb=47cd54a994c1e0a04fd7592e141fb46e29fa070b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f77a16049..477b3a6e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
-AUTOMAKE_OPTIONS = color-tests
+AUTOMAKE_OPTIONS = color-tests parallel-tests
 
 SUBDIRS = . po
 
@@ -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 \
@@ -806,6 +801,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/hashmap.h \
 	src/shared/set.c \
 	src/shared/set.h \
+	src/shared/fdset.c \
+	src/shared/fdset.h \
 	src/shared/strv.c \
 	src/shared/strv.h \
 	src/shared/strbuf.c \
@@ -852,6 +849,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/calendarspec.c \
 	src/shared/calendarspec.h
 
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-dbus.la
@@ -1062,8 +1061,6 @@ libsystemd_core_la_SOURCES = \
 	src/core/mount-setup.h \
 	src/core/loopback-setup.h \
 	src/core/loopback-setup.c \
-	src/core/fdset.c \
-	src/core/fdset.h \
 	src/core/condition.c \
 	src/core/condition.h \
 	src/core/namespace.c \
@@ -1115,6 +1112,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 +1234,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 +1247,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 +1345,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
 
@@ -3475,6 +3481,8 @@ systemd_logind_SOURCES = \
 	src/login/logind-device.h \
 	src/login/logind-button.c \
 	src/login/logind-button.h \
+	src/login/logind-action.c \
+	src/login/logind-action.h \
 	src/login/logind-seat.c \
 	src/login/logind-seat.h \
 	src/login/logind-session.c \
@@ -4145,7 +4153,8 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 clean-local:
 	rm -rf $(abs_srcdir)/install-tree
-	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt
+	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
+              $(abs_srcdir)/hwdb/iab.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -4173,6 +4182,7 @@ hwdb-update:
 	wget -N http://www.linux-usb.org/usb.ids && \
 	wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
 	wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
+	wget -N http://standards.ieee.org/develop/regauth/iab/iab.txt && \
 	./ids-update.pl )
 
 upload: all distcheck