summaryrefslogtreecommitdiff
path: root/pidgin/pixmaps
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2022-08-11 03:06:20 -0500
committerGary Kramlich <grim@reaperworld.com>2022-08-11 03:06:20 -0500
commit49bff88e408a010d681fcc97102fda00162257e1 (patch)
tree63d263800144918552dcd65625bb4655a2091db2 /pidgin/pixmaps
parentd7d841d5b3170c8ee23cf2e3a6c45e1555b028d9 (diff)
downloadpidgin-49bff88e408a010d681fcc97102fda00162257e1.tar.gz
Remove some no longer necessary meson options
nettle was only used for the internal keyring which we dropped awhile ago. The nls and pixmaps options were originally created to decrease the iteration time for developers, but with meson dev environments this is no longer necessary as we don't need to install at all to test things. Testing Done: Ran `meson --wipe` with no issue and compiled. Reviewed at https://reviews.imfreedom.org/r/1577/
Diffstat (limited to 'pidgin/pixmaps')
-rw-r--r--pidgin/pixmaps/emotes/default/24/meson.build19
-rw-r--r--pidgin/pixmaps/emotes/small/16/meson.build18
2 files changed, 17 insertions, 20 deletions
diff --git a/pidgin/pixmaps/emotes/default/24/meson.build b/pidgin/pixmaps/emotes/default/24/meson.build
index 0a6c795e40..51c7eb7d2e 100644
--- a/pidgin/pixmaps/emotes/default/24/meson.build
+++ b/pidgin/pixmaps/emotes/default/24/meson.build
@@ -185,15 +185,14 @@ SMILEYS = [
'yin-yang.png'
]
-if INSTALL_PIXMAPS
- pidginsmileypixdir = pidginpixmapdir / 'emotes/default'
+pidginsmileypixdir = pidginpixmapdir / 'emotes/default'
- custom_target('default-theme',
- input : 'default.theme.in',
- output : 'theme',
- command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
- install : true,
- install_dir : pidginsmileypixdir)
+custom_target('default-theme',
+ input : 'default.theme.in',
+ output : 'theme',
+ command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
+ install : true,
+ install_dir : pidginsmileypixdir)
+
+install_data(SMILEYS, install_dir : pidginsmileypixdir)
- install_data(SMILEYS, install_dir : pidginsmileypixdir)
-endif
diff --git a/pidgin/pixmaps/emotes/small/16/meson.build b/pidgin/pixmaps/emotes/small/16/meson.build
index 8ec0dd7357..c906fa285f 100644
--- a/pidgin/pixmaps/emotes/small/16/meson.build
+++ b/pidgin/pixmaps/emotes/small/16/meson.build
@@ -85,15 +85,13 @@ SMILEYS = [
'wink.png'
]
-if INSTALL_PIXMAPS
- pidginsmileypixdir = pidginpixmapdir / 'emotes/small'
+pidginsmileypixdir = pidginpixmapdir / 'emotes/small'
- custom_target('small-theme',
- input : 'small.theme.in',
- output : 'theme',
- command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
- install : true,
- install_dir : pidginsmileypixdir)
+custom_target('small-theme',
+ input : 'small.theme.in',
+ output : 'theme',
+ command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
+ install : true,
+ install_dir : pidginsmileypixdir)
- install_data(MOODS + SMILEYS, install_dir : pidginsmileypixdir)
-endif
+install_data(MOODS + SMILEYS, install_dir : pidginsmileypixdir)