terminal: provide display dimensions to API users

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 35c877fe2a798b426c22634bbb499ec9e4fe422d..6b2ca29ce884d7ae29c9db9b970137d9e60fa791 100644 (file)
--- 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
@@ -459,7 +462,6 @@ dist_systemunit_DATA = \
        units/network-online.target \
        units/nss-lookup.target \
        units/nss-user-lookup.target \
-       units/hybrid-sleep.target \
        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \
@@ -523,7 +525,6 @@ nodist_systemunit_DATA = \
        units/emergency.service \
        units/rescue.service \
        units/user@.service \
-       units/systemd-hybrid-sleep.service \
        units/systemd-suspend.service \
        units/systemd-halt.service \
        units/systemd-poweroff.service \
@@ -579,7 +580,6 @@ EXTRA_DIST += \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
        units/debug-shell.service.in \
-       units/systemd-hybrid-sleep.service.in \
        units/systemd-suspend.service.in \
        units/quotaon.service.in \
        units/initrd-parse-etc.service.in \
@@ -1342,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 \
@@ -1374,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
@@ -1782,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
@@ -2159,17 +2175,17 @@ systemd_system_update_generator_LDADD = \
 # ------------------------------------------------------------------------------
 if ENABLE_HIBERNATE
 systemgenerator_PROGRAMS += \
-        systemd-hibernate-resume-generator
+       systemd-hibernate-resume-generator
 
 rootlibexec_PROGRAMS += \
-        systemd-hibernate-resume
+       systemd-hibernate-resume
 
 systemd_hibernate_resume_SOURCES = \
-        src/hibernate-resume/hibernate-resume.c
+       src/hibernate-resume/hibernate-resume.c
 
 systemd_hibernate_resume_LDADD = \
-        libsystemd-internal.la \
-        libsystemd-shared.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 systemd_hibernate_resume_generator_SOURCES = \
        src/hibernate-resume/hibernate-resume-generator.c
@@ -2179,16 +2195,18 @@ systemd_hibernate_resume_generator_LDADD = \
        libsystemd-shared.la
 
 EXTRA_DIST += \
-        units/systemd-hibernate.service.in \
-        units/systemd-hibernate-resume@.service.in
+       units/systemd-hibernate.service.in \
+       units/systemd-hibernate-resume@.service.in \
+       units/systemd-hybrid-sleep.service.in
 
 dist_systemunit_DATA += \
-        units/hibernate.target
+       units/hibernate.target \
+       units/hybrid-sleep.target
 
 nodist_systemunit_DATA += \
-        units/systemd-hibernate.service \
-        units/systemd-hibernate-resume@.service
-
+       units/systemd-hibernate.service \
+       units/systemd-hibernate-resume@.service \
+       units/systemd-hybrid-sleep.service
 endif
 
 # ------------------------------------------------------------------------------
@@ -2985,6 +3003,7 @@ noinst_LTLIBRARIES += \
 
 noinst_PROGRAMS += \
        systemd-evcat \
+       systemd-modeset \
        systemd-subterm
 
 unifontdatadir=$(datadir)/unifont
@@ -3003,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 \
@@ -3039,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