[gnome-terminal] build: Remove vala client
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] build: Remove vala client
- Date: Tue, 31 Oct 2017 17:57:40 +0000 (UTC)
commit fa0a4d45323bdab34e45a5f6ff6a65a6e5b50617
Author: Christian Persch <chpe src gnome org>
Date: Tue Oct 31 18:56:00 2017 +0100
build: Remove vala client
configure.ac | 25 --
po/POTFILES.in | 1 -
src/Makefile.am | 65 -----
src/client.vapi | 46 ---
src/config.vapi | 7 -
src/gterminal.vala | 767 ----------------------------------------------------
src/profiles.vapi | 67 -----
7 files changed, 0 insertions(+), 978 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 00d5f60..6a410d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,31 +93,6 @@ PKG_CHECK_MODULES([TERM],
$PLATFORM_DEPS])
# ****
-# Vala
-# ****
-
-AC_MSG_CHECKING([whether gterminal is requested])
-AC_ARG_ENABLE([gterminal],[AS_HELP_STRING([--disable-gterminal],[Disable gterminal])],
- [],[enable_gterminal=yes])
-AC_MSG_RESULT([$enable_gterminal])
-
-AS_IF([test "$enable_gterminal" = "yes"],[
- AM_PROG_VALAC([0.26])
-
- VALA_CHECK_PACKAGES([glib-2.0 gio-2.0 gio-unix-2.0 linux posix])
- PKG_CHECK_MODULES([GTERMINAL],
- [glib-2.0 >= $GLIB_REQUIRED
- gio-2.0 >= $GIO_REQUIRED
- gio-unix-2.0 >= $GIO_REQUIRED
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- dconf >= $DCONF_REQUIRED
- uuid
- $PLATFORM_DEPS])
-])
-
-AM_CONDITIONAL([ENABLE_GTERMINAL],[test "$enable_gterminal" = "yes"])
-
-# ****
# DBus
# ****
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7009d54..2432f67 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@
org.gnome.Terminal.appdata.xml.in
org.gnome.Terminal.Nautilus.metainfo.xml.in
org.gnome.Terminal.desktop.in.in
-src/gterminal.vala
src/migration.c
src/org.gnome.Terminal.gschema.xml
[type: gettext/glade]src/preferences.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index f7b3ecb..b427237 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -191,71 +191,6 @@ terminal_regex_LDFLAGS = \
terminal_regex_LDADD = \
$(TERM_LIBS)
-# Terminal client
-
-if ENABLE_GTERMINAL
-
-noinst_PROGRAMS += gterminal
-
-gterminal_SOURCES = \
- gterminal.vala \
- client.vapi \
- config.vapi \
- profiles.vapi \
- terminal-client-utils.c \
- terminal-client-utils.h \
- terminal-debug.c \
- terminal-debug.h \
- terminal-profiles-list.c \
- terminal-profiles-list.h \
- terminal-settings-list.c \
- terminal-settings-list.h \
- $(NULL)
-
-nodist_gterminal_SOURCES = \
- terminal-type-builtins.c \
- terminal-type-builtins.h \
- $(NULL)
-
-gterminal_VALAFLAGS = \
- --vapidir=. \
- --pkg=glib-2.0 \
- --pkg=gio-2.0 \
- --pkg=gio-unix-2.0 \
- --pkg=posix \
- --pkg=gtk+-$(GTK_API_VERSION) \
- $(GTERMINAL_VALAFLAGS) \
- $(AM_VALAFLAGS)
-
-gterminal_CPPFLAGS = \
- -I$(top_builddir) \
- -DTERMINAL_COMPILATION \
- -DTERMINAL_CLIENT \
- -DLOCALEDIR="\"$(datadir)/locale\"" \
- -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
- $(AM_CPPFLAGS)
-
-# See bug #710862 about -Wsuggest-attribute=format
-gterminal_CFLAGS = \
- --include config.h \
- $(GTERMINAL_CFLAGS) \
- $(AM_CFLAGS) \
- -Wno-cast-qual \
- -Wno-format-nonliteral \
- -Wno-suggest-attribute=format \
- -Wno-unused-but-set-variable \
- -Wno-unused-function \
- -Wno-unused-variable \
- -Wno-write-strings \
- $(NULL)
-gterminal_LDFLAGS = \
- $(AM_LDFLAGS)
-gterminal_LDADD = \
- $(GTERMINAL_LIBS) \
- $(NULL)
-
-endif # ENABLE_GTERMINAL
-
# Legacy terminal client
gnome_terminal_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]