psppire-dictview: Generalize psppire_dict_view_get_var_measurement_stock_id().

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 694ca57697b0b9334f4e8ff32b4246416c4df2d6..47a3215835e7bb47716eabd0fb4666ea2a7562ac 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -98,54 +98,14 @@ src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/p
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 
-themedir = $(DESTDIR)$(datadir)/icons/hicolor
-context = pspp
-
-
 install-lang:
        $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
 
-install-icons:
-       for size in 16x16 ; do \
-         $(MKDIR_P) $(themedir)/$$size/$(context) ; \
-          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
-         $(MKDIR_P) $(themedir)/$$size/apps ; \
-         $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
-       done 
-       if test -z "$(DESTDIR)" ; then \
-               gtk-update-icon-cache --ignore-theme-index $(themedir); \
-       fi
-
-INSTALL_DATA_HOOKS += install-icons install-lang
-
-uninstall-icons:
-       for size in 16x16 ; do \
-          rm -r -f $(themedir)/$$size/$(context); \
-          rm -f $(themedir)/$$size/apps/pspp.png; \
-       done 
-       gtk-update-icon-cache --ignore-theme-index $(themedir)
-
-UNINSTALL_DATA_HOOKS += uninstall-icons
+INSTALL_DATA_HOOKS += install-lang
 
 dist_src_ui_gui_psppire_DATA = \
        $(UI_FILES) \
-       $(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \
        $(top_srcdir)/src/ui/gui/pspp.lang \
-       $(top_srcdir)/src/ui/gui/pspplogo.png \
-       $(top_srcdir)/src/ui/gui/icons/value-labels.png \
-       $(top_srcdir)/src/ui/gui/icons/goto-variable.png\
-       $(top_srcdir)/src/ui/gui/icons/insert-case.png \
-       $(top_srcdir)/src/ui/gui/icons/insert-variable.png \
-       $(top_srcdir)/src/ui/gui/icons/recent-dialogs.png \
-       $(top_srcdir)/src/ui/gui/icons/split-file.png \
-       $(top_srcdir)/src/ui/gui/icons/select-cases.png \
-       $(top_srcdir)/src/ui/gui/icons/weight-cases.png \
-       $(top_srcdir)/src/ui/gui/icons/16x16/nominal.png  \
-       $(top_srcdir)/src/ui/gui/icons/16x16/ordinal.png \
-       $(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
-       $(top_srcdir)/src/ui/gui/icons/16x16/string.png \
-       $(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
-       $(top_srcdir)/src/ui/gui/icons/splash.png \
        $(top_srcdir)/src/ui/gui/psppire.gtkrc
 
 src_ui_gui_psppire_SOURCES = \
@@ -413,3 +373,8 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
 EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
 
+include $(top_srcdir)/src/ui/gui/icons/automake.mk
+
+UNINSTALL_DATA_HOOKS += update-icon-cache
+INSTALL_DATA_HOOKS += update-icon-cache
+