projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
ui
/
gui
/
icons
/
automake.mk
diff --git
a/src/ui/gui/icons/automake.mk
b/src/ui/gui/icons/automake.mk
index c2bc16bfd1be5fba07bb9c82267dc54158d17302..f57c9b4847a78fa4f2404654d7aa740712366afb 100644
(file)
--- a/
src/ui/gui/icons/automake.mk
+++ b/
src/ui/gui/icons/automake.mk
@@
-4,7
+4,7
@@
EXTRA_DIST += $(icons) $(icon_srcs)
themedir = $(DESTDIR)$(datadir)/icons/hicolor
themedir = $(DESTDIR)$(datadir)/icons/hicolor
-sizes=16x16 22x22 24x24 32x32 48x48 256x256
+sizes=16x16 22x22 24x24 32x32 48x48 256x256
scalable
install-ext-icons:
for context in apps mimetypes; do \
install-ext-icons:
for context in apps mimetypes; do \
@@
-55,6
+55,16
@@
uninstall-icons:
done
done
-
INSTALL_DATA_HOOKS += install-icons install-ext-icons
UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons
INSTALL_DATA_HOOKS += install-icons install-ext-icons
UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons
+
+if HAVE_GUI
+dist_src_ui_gui_psppire_DATA += \
+ $(top_srcdir)/src/ui/gui/icons/splash.png
+
+src_ui_gui_psppire_SOURCES += \
+ src/ui/gui/icons/icon-names.c \
+ src/ui/gui/icons/icon-names.h
+
+endif
+