[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 124/132] meson: install icons
From: |
Paolo Bonzini |
Subject: |
[PATCH 124/132] meson: install icons |
Date: |
Thu, 19 Dec 2019 13:23:44 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 14 --------------
ui/icons/meson.build | 13 +++++++++++++
ui/meson.build | 1 +
3 files changed, 14 insertions(+), 14 deletions(-)
create mode 100644 ui/icons/meson.build
diff --git a/Makefile b/Makefile
index 22f9883..04a7d00 100644
--- a/Makefile
+++ b/Makefile
@@ -232,8 +232,6 @@ ifeq ($(CONFIG_GUEST_AGENT),y)
endif
endif
-ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-
install: all install-datadir install-localstatedir \
recurse-install
ifneq ($(vhost-user-json-y),)
@@ -242,18 +240,6 @@ ifneq ($(vhost-user-json-y),)
$(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \
done
endif
- for s in $(ICON_SIZES); do \
- mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
- $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
-
"$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
- done; \
- mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \
- $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \
- "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
- mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \
- $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
- "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
- mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
$(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
"$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
ifdef CONFIG_GTK
diff --git a/ui/icons/meson.build b/ui/icons/meson.build
new file mode 100644
index 0000000..b6e21f6
--- /dev/null
+++ b/ui/icons/meson.build
@@ -0,0 +1,13 @@
+foreach s: [16, 24, 32, 48, 64, 128, 256, 512]
+ s = '@0@x@0@'.format(s.to_string())
+ install_data('qemu_@0@.png'.format(s),
+ rename: 'qemu.png',
+ install_dir: config_host['qemu_icondir'] / 'hicolor' / s /
'apps')
+endforeach
+
+install_data('qemu_32x32.bmp',
+ rename: 'qemu.bmp',
+ install_dir: config_host['qemu_icondir'] / 'hicolor' / '32x32' /
'apps')
+
+install_data('qemu.svg',
+ install_dir: config_host['qemu_icondir'] / 'hicolor' / 'scalable'
/ 'apps')
diff --git a/ui/meson.build b/ui/meson.build
index 0867cdc..22923e3 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -107,5 +107,6 @@ foreach e : keymaps
endforeach
subdir('shader')
+subdir('icons')
modules += {'ui': ui_modules}
--
1.8.3.1
- [PATCH 113/132] systemtap, (continued)
- [PATCH 113/132] systemtap, Paolo Bonzini, 2019/12/19
- [PATCH 112/132] Aaaaallelujah!, Paolo Bonzini, 2019/12/19
- [PATCH 115/132] remove Makefile.target, Paolo Bonzini, 2019/12/19
- [PATCH 116/132] meson: sphinx-build, Paolo Bonzini, 2019/12/19
- [PATCH 117/132] meson: generate version.texi, Paolo Bonzini, 2019/12/19
- [PATCH 120/132] meson: install some scripts, Paolo Bonzini, 2019/12/19
- [PATCH 119/132] meson: add NSIS building, Paolo Bonzini, 2019/12/19
- [PATCH 121/132] meson: install edk2, Paolo Bonzini, 2019/12/19
- [PATCH 122/132] meson: install blobs, Paolo Bonzini, 2019/12/19
- [PATCH 118/132] meson: build texi doc, Paolo Bonzini, 2019/12/19
- [PATCH 124/132] meson: install icons,
Paolo Bonzini <=
- [PATCH 123/132] meson: install edk2 json descriptors, Paolo Bonzini, 2019/12/19
- [PATCH 125/132] meson: install desktop file, Paolo Bonzini, 2019/12/19
- [PATCH 126/132] meson: install keymaps, Paolo Bonzini, 2019/12/19
- [PATCH 127/132] meson: convert po/, Paolo Bonzini, 2019/12/19
- [PATCH 128/132] meson: replace pc-bios/keymaps/Makefile, Paolo Bonzini, 2019/12/19
- [PATCH 129/132] meson: replace mostly useless pc-bios/Makefile, Paolo Bonzini, 2019/12/19
- [PATCH 130/132] meson: convert pc-bios/s390-ccw, Paolo Bonzini, 2019/12/19
- [PATCH 132/132] rules.mak: drop unneeded macros, Paolo Bonzini, 2019/12/19
- [PATCH 131/132] meson: convert pc-bios/optionrom, Paolo Bonzini, 2019/12/19