summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2015-01-28 14:13:42 (GMT)
committerLars Uebernickel <lars.uebernickel@canonical.com>2015-01-28 14:26:46 (GMT)
commit8e8a94bc23b782777d3071d10c7847c5b49442d8 (patch)
tree0abf5d1a38ac420e7a3d97b3718e19a7a9f984f1
parentf3d95d05eb599c80327db0b7c318d60818b48609 (diff)
downloadgtk+-8e8a94bc23b782777d3071d10c7847c5b49442d8.zip
gtk+-8e8a94bc23b782777d3071d10c7847c5b49442d8.tar.xz
Also bundle icons in status/ as resources
https://bugzilla.gnome.org/show_bug.cgi?id=743647
-rw-r--r--gtk/Makefile.am11
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2daf367..738ca8e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1155,10 +1155,13 @@ gtk.gresource.xml: Makefile.am
n=`basename $$f`; \
echo " <file compressed='true'>ui/$$n</file>" >> $@; \
done; \
- for s in 16x16 22x22 24x24 32x32; do \
- for f in $(srcdir)/icons/$$s/actions/*.png; do \
- n=`basename $$f`; \
- echo " <file>icons/$$s/actions/$$n</file>" >> $@; \
+ shopt -s nullglob; \
+ for s in 16x16 22x22 24x24 32x32 48x48; do \
+ for c in actions status; do \
+ for f in $(srcdir)/icons/$$s/$$c/*.png; do \
+ n=`basename $$f`; \
+ echo " <file>icons/$$s/$$c/$$n</file>" >> $@; \
+ done; \
done; \
done; \
for f in $(srcdir)/inspector/*.ui; do \