BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+ what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
install-busnames-target-wants-hook:
what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
EXTRA_DIST += \
man/systemd.index.xml \
man/index.html \
- man/systemd.directives.xml
+ man/systemd.directives.xml \
+ man/glib-event-glue.c
CLEANFILES += \
man/systemd.index.xml \
libsystemd_shared_la_SOURCES = \
src/shared/linux/auto_dev-ioctl.h \
- src/shared/linux/fanotify.h \
src/shared/ioprio.h \
src/shared/missing.h \
src/shared/initreq.h \
test_namespace_LDADD = \
libsystemd-core.la
+CLEANFILES += \
+ src/test/test-hashmap-ordered.c
+
+BUILT_SOURCES += \
+ src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+ { if (!match($$0, "^#include")) \
+ gsub(/hashmap/, "ordered_hashmap"); \
+ gsub(/HASHMAP/, "ORDERED_HASHMAP"); \
+ gsub(/Hashmap/, "OrderedHashmap"); \
+ print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+ src/test/test-hashmap-ordered.c
+
test_hashmap_SOURCES = \
- src/test/test-hashmap.c
+ src/test/test-hashmap.c \
+ src/test/test-hashmap-plain.c
test_hashmap_LDADD = \
libsystemd-core.la
dist_systemunit_DATA += \
units/systemd-bus-proxyd.socket
-dist_userunit_DATA += \
- units/user/systemd-bus-proxyd.socket \
+nodist_userunit_DATA += \
units/user/systemd-bus-proxyd@.service
+
+dist_userunit_DATA += \
+ units/user/systemd-bus-proxyd.socket
endif
EXTRA_DIST += \
- units/systemd-bus-proxyd@.service.in
+ units/systemd-bus-proxyd@.service.in \
+ units/user/systemd-bus-proxyd@.service.in
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
noinst_LTLIBRARIES += \
libsystemd-terminal.la
+rootlibexec_PROGRAMS += \
+ systemd-consoled
+
noinst_PROGRAMS += \
systemd-evcat \
systemd-modeset \
systemd-subterm
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
src/libsystemd-terminal/unifont-glyph-array.bin
+nodist_userunit_DATA += \
+ units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+ systemd-consoled.service
+
+EXTRA_DIST += \
+ units/user/systemd-consoled.service.in
+
tests += \
test-term-page \
test-term-parser \
src/libsystemd-terminal/sysview.h \
src/libsystemd-terminal/sysview-internal.h \
src/libsystemd-terminal/sysview.c \
+ src/libsystemd-terminal/term.h \
src/libsystemd-terminal/term-internal.h \
src/libsystemd-terminal/term-charset.c \
src/libsystemd-terminal/term-page.c \
src/libsystemd-terminal/term-parser.c \
src/libsystemd-terminal/term-screen.c \
src/libsystemd-terminal/term-wcwidth.c \
- src/libsystemd-terminal/unifont-internal.h \
+ src/libsystemd-terminal/unifont.h \
+ src/libsystemd-terminal/unifont-def.h \
src/libsystemd-terminal/unifont.c
libsystemd_terminal_la_LIBADD = \
libsystemd-shared.la \
$(TERMINAL_LIBS)
+systemd_consoled_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(TERMINAL_CFLAGS)
+
+systemd_consoled_SOURCES = \
+ src/console/consoled.h \
+ src/console/consoled.c \
+ src/console/consoled-display.c \
+ src/console/consoled-manager.c \
+ src/console/consoled-session.c \
+ src/console/consoled-terminal.c \
+ src/console/consoled-workspace.c
+
+systemd_consoled_LDADD = \
+ libsystemd-terminal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ $(TERMINAL_LIBS)
+
systemd_evcat_CFLAGS = \
$(AM_CFLAGS) \
$(TERMINAL_CFLAGS)