X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f0482cfe72c76131792376163583873c1170cd0c;hb=01c3322e017989d25f7b4b51268245d5315ae678;hp=f0d80ba748a96c297e5187747477e43e5d9a91e4;hpb=279da1e3f99b9c767a69849b5445e3cfd8d83376;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f0d80ba74..f0482cfe7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,6 +209,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libsystemd/sd-event \
 	-I $(top_srcdir)/src/libsystemd/sd-rtnl \
 	-I $(top_srcdir)/src/libsystemd-network \
+	-I $(top_srcdir)/src/libsystemd-terminal \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -843,10 +844,10 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/ring.h \
 	src/shared/barrier.c \
 	src/shared/barrier.h \
+	src/shared/pty.c \
+	src/shared/pty.h \
 	src/shared/async.c \
 	src/shared/async.h \
-	src/shared/eventfd-util.c \
-	src/shared/eventfd-util.h \
 	src/shared/copy.c \
 	src/shared/copy.h \
 	src/shared/base-filesystem.c \
@@ -1254,6 +1255,7 @@ tests += \
 	test-util \
 	test-ring \
 	test-barrier \
+	test-pty \
 	test-tmpfiles \
 	test-namespace \
 	test-date \
@@ -1430,6 +1432,12 @@ test_barrier_SOURCES = \
 test_barrier_LDADD = \
 	libsystemd-core.la
 
+test_pty_SOURCES = \
+	src/test/test-pty.c
+
+test_pty_LDADD = \
+	libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
 	src/test/test-tmpfiles.c
 
@@ -1468,10 +1476,13 @@ test_tables_SOURCES = \
 	src/journal/journald-server.c \
 	src/journal/journald-server.h
 
+test_tables_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src/bus-proxyd
+
 test_tables_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	-I$(srcdir)/src/bus-proxyd
+	$(SECCOMP_CFLAGS)
 
 test_tables_LDADD = \
 	libsystemd-logs.la \
@@ -2819,6 +2830,80 @@ tests += \
 	test-icmp6-rs \
 	test-dhcp6-client
 
+# ------------------------------------------------------------------------------
+if ENABLE_TERMINAL
+noinst_LTLIBRARIES += \
+	libsystemd-terminal.la
+
+noinst_PROGRAMS += \
+	systemd-subterm
+
+unifontdatadir=$(datadir)/unifont
+
+dist_unifontdata_DATA = \
+	src/libsystemd-terminal/unifont-glyph-array.bin
+
+tests += \
+	test-term-page \
+	test-term-parser \
+	test-unifont
+endif
+
+libsystemd_terminal_la_CFLAGS = \
+	$(AM_CFLAGS)
+
+libsystemd_terminal_la_SOURCES = \
+	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.c
+
+libsystemd_terminal_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+systemd_subterm_SOURCES = \
+	src/libsystemd-terminal/subterm.c
+
+systemd_subterm_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_term_page_SOURCES = \
+	src/libsystemd-terminal/test-term-page.c
+
+test_term_page_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_term_parser_SOURCES = \
+	src/libsystemd-terminal/test-term-parser.c
+
+test_term_parser_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_unifont_SOURCES = \
+	src/libsystemd-terminal/test-unifont.c
+
+test_unifont_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+update-unifont:
+	$(AM_V_GEN)cat $(top_srcdir)/src/libsystemd-terminal/unifont.hex | $(PYTHON) $(top_srcdir)/tools/compile-unifont.py >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
+	@echo "unifont-glyph-array.bin has been regenerated"
+
+.PHONY: update-unifont
+
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
 SUBDIRS += \
@@ -4623,7 +4708,9 @@ systemd_resolved_SOURCES = \
 	src/resolve/resolved-dns-server.h \
 	src/resolve/resolved-dns-server.c \
 	src/resolve/resolved-dns-rr.h \
-	src/resolve/resolved-dns-rr.c
+	src/resolve/resolved-dns-rr.c \
+	src/resolve/resolved-dns-cache.h \
+	src/resolve/resolved-dns-cache.c
 
 nodist_systemd_resolved_SOURCES = \
 	src/resolve/resolved-gperf.c
@@ -4781,8 +4868,11 @@ systemd_networkd_wait_online_CFLAGS = \
 
 systemd_networkd_wait_online_SOURCES = \
 	src/libsystemd-network/network-internal.h \
+	src/network/networkd-wait-online.h \
+	src/network/networkd-wait-online-link.h \
 	src/network/networkd-wait-online.c \
-	src/network/networkd-wait-online.h
+	src/network/networkd-wait-online-manager.c \
+	src/network/networkd-wait-online-link.c
 
 systemd_networkd_wait_online_LDADD = \
 	libsystemd-network.la \