X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6b2ca29ce884d7ae29c9db9b970137d9e60fa791;hp=de40043c5bb439263ab9854d64013c9fe766167c;hb=9c77924c29874aa4684c2a9e1a7b9ee547d49d85;hpb=72ba9f04f95bc6eda1e32fdd21ea56476713a5bc

diff --git a/Makefile.am b/Makefile.am
index de40043c5..6b2ca29ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 AUTOMAKE_OPTIONS = color-tests parallel-tests
 
+GCC_COLORS ?= 'ooh, shiny!'
+export GCC_COLORS
+
 SUBDIRS = . po
 
 # remove targets if the command fails
@@ -1339,7 +1342,8 @@ tests += \
 	test-async \
 	test-ratelimit \
 	test-condition-util \
-	test-uid-range
+	test-uid-range \
+	test-bus-policy
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1371,7 +1375,12 @@ EXTRA_DIST += \
 	test/sysinit.target \
 	test/testsuite.target \
 	test/timers.target \
-	test/unstoppable.service
+	test/unstoppable.service \
+	test/bus-policy/hello.conf \
+	test/bus-policy/methods.conf \
+	test/bus-policy/ownerships.conf \
+	test/bus-policy/signals.conf
+
 
 EXTRA_DIST += \
 	src/test/test-helper.h
@@ -1779,6 +1788,16 @@ test_conf_files_SOURCES = \
 test_conf_files_LDADD = \
 	libsystemd-shared.la
 
+test_bus_policy_SOURCES = \
+	src/bus-proxyd/test-bus-policy.c \
+	src/bus-proxyd/bus-policy.c \
+	src/bus-proxyd/bus-policy.h
+
+test_bus_policy_LDADD = \
+	libsystemd-capability.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -2984,6 +3003,7 @@ noinst_LTLIBRARIES += \
 
 noinst_PROGRAMS += \
 	systemd-evcat \
+	systemd-modeset \
 	systemd-subterm
 
 unifontdatadir=$(datadir)/unifont
@@ -3002,6 +3022,10 @@ libsystemd_terminal_la_CFLAGS = \
 	$(TERMINAL_CFLAGS)
 
 libsystemd_terminal_la_SOURCES = \
+	src/libsystemd-terminal/grdev.h \
+	src/libsystemd-terminal/grdev-internal.h \
+	src/libsystemd-terminal/grdev.c \
+	src/libsystemd-terminal/grdev-drm.c \
 	src/libsystemd-terminal/idev.h \
 	src/libsystemd-terminal/idev-internal.h \
 	src/libsystemd-terminal/idev.c \
@@ -3038,6 +3062,19 @@ systemd_evcat_LDADD = \
 	libsystemd-shared.la \
 	$(TERMINAL_LIBS)
 
+systemd_modeset_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(TERMINAL_CFLAGS)
+
+systemd_modeset_SOURCES = \
+	src/libsystemd-terminal/modeset.c
+
+systemd_modeset_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	$(TERMINAL_LIBS)
+
 systemd_subterm_SOURCES = \
 	src/libsystemd-terminal/subterm.c