[gnome-terminal/wip/inigomartinez/meson: 2/2] build: Remove autotools
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal/wip/inigomartinez/meson: 2/2] build: Remove autotools
- Date: Wed, 3 Apr 2019 13:50:27 +0000 (UTC)
commit 6a466130b6e904dd319d915d895140a0c183949c
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Jan 24 12:31:27 2019 +0100
build: Remove autotools
To avoid the burden of maintaining multiple build systems
autotools support is removed.
Makefile.am | 86 --------
acinclude.m4 | 289 -------------------------
autogen.sh | 15 --
configure.ac | 331 ----------------------------
data/Makefile.am | 3 -
data/icons/Makefile.am | 53 -----
git.mk | 227 --------------------
help/Makefile.am | 50 -----
m4/ax_pthread.m4 | 485 ------------------------------------------
src/Makefile.am | 351 ------------------------------
src/meson.build | 4 +-
src/nautilus.symbols | 3 -
src/terminal-menubar.ui.in | 28 +--
src/terminal-menubar.ui.meson | 251 ----------------------
14 files changed, 16 insertions(+), 2160 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 6d82e1de..b515e0c5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -123,7 +123,7 @@ mnemonics_conf = {
}
resource_data += configure_file(
- input: menubar + '.ui.meson',
+ input: menubar + '.ui.in',
output: menubar + '-with-mnemonics.ui',
configuration: mnemonics_conf,
)
@@ -136,7 +136,7 @@ mnemonics_conf = {
}
resource_data += configure_file(
- input: menubar + '.ui.meson',
+ input: menubar + '.ui.in',
output: menubar + '-without-mnemonics.ui',
configuration: mnemonics_conf,
)
diff --git a/src/terminal-menubar.ui.in b/src/terminal-menubar.ui.in
index 39048941..0929757f 100644
--- a/src/terminal-menubar.ui.in
+++ b/src/terminal-menubar.ui.in
@@ -18,8 +18,8 @@
<interface>
<menu id="menubar">
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">_File</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">File</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label" translatable="yes">_File</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">File</attribute>@WITHOUT_MNEMONIC_END@
<section id="new-terminal-section" />
<section>
<item>
@@ -52,8 +52,8 @@
</section>
</submenu>
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">_Edit</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">Edit</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label" translatable="yes">_Edit</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">Edit</attribute>@WITHOUT_MNEMONIC_END@
<section>
<item>
<attribute name="label" translatable="yes">_Copy</attribute>
@@ -89,8 +89,8 @@
</section>
</submenu>
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">_View</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">View</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label" translatable="yes">_View</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">View</attribute>@WITHOUT_MNEMONIC_END@
<section>
<item>
<attribute name="label" translatable="yes">Show _Menubar</attribute>
@@ -118,8 +118,8 @@
</section>
</submenu>
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">_Search</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">Search</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label" translatable="yes">_Search</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">Search</attribute>@WITHOUT_MNEMONIC_END@
<section>
<item>
<attribute name="label" translatable="yes">_Find…</attribute>
@@ -140,8 +140,8 @@
</section>
</submenu>
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">_Terminal</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">Terminal</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label"
translatable="yes">_Terminal</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">Terminal</attribute>@WITHOUT_MNEMONIC_END@
<section>
<section id="set-profile-section" />
<item>
@@ -195,8 +195,8 @@
</section>
</submenu>
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">Ta_bs</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">Tabs</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label" translatable="yes">Ta_bs</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">Tabs</attribute>@WITHOUT_MNEMONIC_END@
<attribute name="action">win.tabs-menu</attribute>
<attribute name="hidden-when">action-disabled</attribute>
<section>
@@ -227,8 +227,8 @@
</section>
</submenu>
<submenu>
- <WITH_MNEMONIC><attribute name="label" translatable="yes">_Help</attribute></WITH_MNEMONIC>
- <WITHOUT_MNEMONIC><attribute name="label" translatable="yes">Help</attribute></WITHOUT_MNEMONIC>
+ @WITH_MNEMONIC_START@<attribute name="label" translatable="yes">_Help</attribute>@WITH_MNEMONIC_END@
+ @WITHOUT_MNEMONIC_START@<attribute name="label"
translatable="yes">Help</attribute>@WITHOUT_MNEMONIC_END@
<section>
<item>
<attribute name="label" translatable="yes">_Contents</attribute>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]