Merge remote-tracking branch 'origin/master' into sheet

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

diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index 9787a92ad45a987ab3e5077ac27baa4c60922943..d3eb0ef1b7b6e2130277d5864e4ec460986bf4a8 100644 (file)
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -1,7 +1,23 @@
-include $(top_srcdir)/src/ui/gui/icons/manifest
-
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 EXTRA_DIST += $(icons) $(icon_srcs) src/ui/gui/icons/COPYING_CCBYSA3
 
+include $(top_srcdir)/src/ui/gui/icons/manifest
+
 themedir = $(DESTDIR)$(datadir)/icons/hicolor
 
 sizes=16x16 22x22  24x24 32x32 48x48 256x256 scalable
@@ -10,9 +26,9 @@ install-ext-icons:
        for context in apps mimetypes; do \
                for size in $(sizes); do \
                $(MKDIR_P) $(themedir)/$$size/$$context ; \
-                       if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
+                       if (cd $(top_srcdir)/src/ui/gui/icons/$$size/$$context && \
                                (test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
-                               $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$context/$$size/* $(themedir)/$$size/$$context ; \
+                               $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/$$context/* $(themedir)/$$size/$$context ; \
                        fi ; \
                done ; \
        done
@@ -21,7 +37,7 @@ install-ext-icons:
 uninstall-ext-icons:
        for context in apps mimetypes; do \
                for size in $(sizes); do \
-                       if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
+                       if (cd $(top_srcdir)/src/ui/gui/icons/$$size/$$context && \
                                (test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
                                  rm -rf $(themedir)/$$size/$$context/application-x-spss-* ; \
                                  rm -rf $(themedir)/$$size/$$context/pspp* ; \
@@ -62,18 +78,15 @@ if HAVE_GUI
 nodist_src_ui_gui_psppire_DATA = src/ui/gui/icons/splash.png
 
 src/ui/gui/icons/splash.png: $(top_srcdir)/src/ui/gui/icons/splash-t.png $(top_srcdir)/src/ui/gui/icons/splash-r.png Makefile
-       @case `$(AM_V_at)echo $(VERSION) | $(AM_V_at)$(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
+       @$(MKDIR_P) src/ui/gui/icons
+       @case `echo $(VERSION) | $(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
          [13579]) cp $(top_srcdir)/src/ui/gui/icons/splash-t.png $@ ; \
        ;;\
          *) cp $(top_srcdir)/src/ui/gui/icons/splash-r.png $@ ; \
        ;;\
 esac
 
-EXTRA_DIST += $(top_srcdir)/src/ui/gui/artwork/splash.svg
-
-src_ui_gui_psppire_SOURCES += \
-       src/ui/gui/icons/icon-names.c \
-       src/ui/gui/icons/icon-names.h
+EXTRA_DIST += $(top_srcdir)/src/ui/gui/artwork/splash.svg $(icons) $(icon_srcs)
 
 endif