Merge pull request #747 from dvdhrm/consoled

terminal: drop unfinished code

1 files changed, 0 insertions, 140 deletions

diff --git a/Makefile.am b/Makefile.am
index d21982285f..0edb1d88e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -237,7 +237,6 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libsystemd/sd-hwdb \
 	-I $(top_srcdir)/src/libsystemd/sd-device \
 	-I $(top_srcdir)/src/libsystemd-network \
-	-I $(top_srcdir)/src/libsystemd-terminal \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -3308,145 +3307,6 @@ manual_tests += \
 	test-pppoe
 
 # ------------------------------------------------------------------------------
-if ENABLE_TERMINAL
-noinst_LTLIBRARIES += \
-	libsystemd-terminal.la
-
-rootlibexec_PROGRAMS += \
-	systemd-consoled
-
-noinst_PROGRAMS += \
-	systemd-evcat \
-	systemd-modeset \
-	systemd-subterm
-
-pkgdata_DATA = \
-	src/libsystemd-terminal/unifont-glyph-array.bin
-
-nodist_userunit_DATA += \
-	units/user/systemd-consoled.service
-
-USER_DEFAULT_TARGET_WANTS += \
-	systemd-consoled.service
-
-tests += \
-	test-term-page \
-	test-term-parser \
-	test-unifont
-endif
-
-EXTRA_DIST += \
-	units/user/systemd-consoled.service.in
-
-libsystemd_terminal_la_CFLAGS = \
-	$(AM_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 \
-	src/libsystemd-terminal/idev-evdev.c \
-	src/libsystemd-terminal/idev-keyboard.c \
-	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.h \
-	src/libsystemd-terminal/unifont-def.h \
-	src/libsystemd-terminal/unifont.c
-
-libsystemd_terminal_la_LIBADD = \
-	libshared.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 \
-	libshared.la \
-	$(TERMINAL_LIBS)
-
-systemd_evcat_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(TERMINAL_CFLAGS)
-
-systemd_evcat_SOURCES = \
-	src/libsystemd-terminal/evcat.c
-
-systemd_evcat_LDADD = \
-	libsystemd-terminal.la \
-	libshared.la \
-	$(TERMINAL_LIBS)
-
-systemd_modeset_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(TERMINAL_CFLAGS)
-
-systemd_modeset_SOURCES = \
-	src/libsystemd-terminal/modeset.c
-
-systemd_modeset_LDADD = \
-	libsystemd-terminal.la \
-	libshared.la \
-	$(TERMINAL_LIBS)
-
-systemd_subterm_SOURCES = \
-	src/libsystemd-terminal/subterm.c
-
-systemd_subterm_LDADD = \
-	libsystemd-terminal.la \
-	libshared.la
-
-test_term_page_SOURCES = \
-	src/libsystemd-terminal/test-term-page.c
-
-test_term_page_LDADD = \
-	libsystemd-terminal.la \
-	libshared.la
-
-test_term_parser_SOURCES = \
-	src/libsystemd-terminal/test-term-parser.c
-
-test_term_parser_LDADD = \
-	libsystemd-terminal.la \
-	libshared.la
-
-test_unifont_SOURCES = \
-	src/libsystemd-terminal/test-unifont.c
-
-test_unifont_LDADD = \
-	libsystemd-terminal.la \
-	libshared.la
-
-src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT)
-	$(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@
-
-EXTRA_DIST += \
-	tools/compile-unifont.py
-
-# ------------------------------------------------------------------------------
 include_HEADERS += \
 	src/libudev/libudev.h