X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=21e7ff18f777046c37cc1724e4cd06411e44ec10;hb=refs%2Fheads%2Fctables7;hp=99cde1e742e14dcecba1caba5df27213088acfac;hpb=7293c1a383d325c371bd708401e5a1d7586a4d90;p=pspp diff --git a/Smake b/Smake index 99cde1e742..21e7ff18f7 100644 --- a/Smake +++ b/Smake @@ -1,5 +1,23 @@ # -*- makefile -*- +# 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 . +# + + all: everything # Adjust these to reflect where you've installed gnulib. @@ -19,14 +37,17 @@ GNULIB_MODULES = \ close \ configmake \ count-one-bits \ + count-leading-zeros \ crc \ crypto/md4 \ crypto/rijndael \ dirname \ dtoastr \ + dtotimespec \ environ \ fatal-signal \ fcntl \ + fnmatch \ fpieee \ fprintf-posix \ full-read \ @@ -36,10 +57,13 @@ GNULIB_MODULES = \ fwriteerror \ getline \ getpass \ - gettext \ + gettext-h \ + gettime \ gettimeofday \ getopt-gnu \ gitlog-to-changelog \ + havelib \ + iconv \ include_next \ isfinite \ isinf \ @@ -47,11 +71,13 @@ GNULIB_MODULES = \ intprops \ inttostr \ localcharset \ + localename \ mbchar \ mbiter \ memcasecmp \ memchr \ memchr2 \ + memmem \ mempcpy \ memrchr \ minmax \ @@ -77,18 +103,22 @@ GNULIB_MODULES = \ strcasestr \ stpcpy \ strerror \ - strftime \ + nstrftime \ strsep \ strtod \ strtok_r \ sys_stat \ tempname \ termios \ + timespec \ + timespec-add \ + timespec-sub \ trunc \ unicase/u8-casecmp \ unicase/u8-casefold \ unicase/u8-tolower \ unicase/u8-toupper \ + unicase/u8-totitle \ unictype/ctype-print \ unictype/category-of \ unigbrk/uc-is-grapheme-break \ @@ -108,6 +138,7 @@ GNULIB_MODULES = \ unitypes \ unlocked-io \ vasprintf-posix \ + verify \ version-etc \ version-etc-fsf \ vfprintf-posix \ @@ -117,6 +148,7 @@ GNULIB_MODULES = \ vsprintf-posix \ xalloc \ xalloc-die \ + xbinary-io \ xmalloca \ xmemdup0 \ xsize \ @@ -124,44 +156,66 @@ GNULIB_MODULES = \ xvasprintf APP_ICONS = \ -src/ui/gui/icons/32x32/apps/pspp.png \ -src/ui/gui/icons/22x22/apps/pspp.png \ -src/ui/gui/icons/24x24/apps/pspp.png \ src/ui/gui/icons/16x16/apps/pspp.png \ +src/ui/gui/icons/32x32/apps/pspp.png \ src/ui/gui/icons/48x48/apps/pspp.png \ src/ui/gui/icons/256x256/apps/pspp.png \ src/ui/gui/icons/scalable/apps/pspp.svg CATEGORY_ICONS = \ -src/ui/gui/icons/16x16/categories/align-left.png \ -src/ui/gui/icons/16x16/categories/align-center.png \ -src/ui/gui/icons/16x16/categories/align-right.png \ -src/ui/gui/icons/16x16/categories/measure-scale.png \ -src/ui/gui/icons/16x16/categories/measure-ordinal.png \ -src/ui/gui/icons/16x16/categories/measure-nominal.png \ -src/ui/gui/icons/16x16/categories/measure-date-scale.png \ -src/ui/gui/icons/16x16/categories/measure-date-nominal.png \ -src/ui/gui/icons/16x16/categories/measure-date-ordinal.png \ -src/ui/gui/icons/16x16/categories/measure-time-scale.png \ -src/ui/gui/icons/16x16/categories/measure-time-nominal.png \ -src/ui/gui/icons/16x16/categories/measure-time-ordinal.png \ -src/ui/gui/icons/16x16/categories/measure-string-nominal.png \ -src/ui/gui/icons/16x16/categories/measure-string-ordinal.png \ -src/ui/gui/icons/16x16/categories/measure-currency-scale.png \ -src/ui/gui/icons/16x16/categories/measure-currency-nominal.png \ -src/ui/gui/icons/16x16/categories/measure-currency-ordinal.png \ -src/ui/gui/icons/16x16/categories/role-input.png \ -src/ui/gui/icons/16x16/categories/role-target.png \ -src/ui/gui/icons/16x16/categories/role-both.png \ -src/ui/gui/icons/16x16/categories/role-none.png \ -src/ui/gui/icons/16x16/categories/role-partition.png \ -src/ui/gui/icons/16x16/categories/role-split.png - +src/ui/gui/icons/48x48/categories/align-left.png \ +src/ui/gui/icons/48x48/categories/align-center.png \ +src/ui/gui/icons/48x48/categories/align-right.png \ +src/ui/gui/icons/48x48/categories/measure-scale.png \ +src/ui/gui/icons/48x48/categories/measure-ordinal.png \ +src/ui/gui/icons/48x48/categories/measure-nominal.png \ +src/ui/gui/icons/48x48/categories/measure-date-scale.png \ +src/ui/gui/icons/48x48/categories/measure-date-nominal.png \ +src/ui/gui/icons/48x48/categories/measure-date-ordinal.png \ +src/ui/gui/icons/48x48/categories/measure-time-scale.png \ +src/ui/gui/icons/48x48/categories/measure-time-nominal.png \ +src/ui/gui/icons/48x48/categories/measure-time-ordinal.png \ +src/ui/gui/icons/48x48/categories/measure-string-nominal.png \ +src/ui/gui/icons/48x48/categories/measure-string-ordinal.png \ +src/ui/gui/icons/48x48/categories/measure-currency-scale.png \ +src/ui/gui/icons/48x48/categories/measure-currency-nominal.png \ +src/ui/gui/icons/48x48/categories/measure-currency-ordinal.png \ +src/ui/gui/icons/48x48/categories/role-input.png \ +src/ui/gui/icons/48x48/categories/role-target.png \ +src/ui/gui/icons/48x48/categories/role-both.png \ +src/ui/gui/icons/48x48/categories/role-none.png \ +src/ui/gui/icons/48x48/categories/role-partition.png \ +src/ui/gui/icons/48x48/categories/role-split.png \ +src/ui/gui/icons/scalable/categories/align-left.svg \ +src/ui/gui/icons/scalable/categories/align-center.svg \ +src/ui/gui/icons/scalable/categories/align-right.svg \ +src/ui/gui/icons/scalable/categories/measure-scale.svg \ +src/ui/gui/icons/scalable/categories/measure-ordinal.svg \ +src/ui/gui/icons/scalable/categories/measure-nominal.svg \ +src/ui/gui/icons/scalable/categories/measure-date-scale.svg \ +src/ui/gui/icons/scalable/categories/measure-date-nominal.svg \ +src/ui/gui/icons/scalable/categories/measure-date-ordinal.svg \ +src/ui/gui/icons/scalable/categories/measure-time-scale.svg \ +src/ui/gui/icons/scalable/categories/measure-time-nominal.svg \ +src/ui/gui/icons/scalable/categories/measure-time-ordinal.svg \ +src/ui/gui/icons/scalable/categories/measure-string-nominal.svg \ +src/ui/gui/icons/scalable/categories/measure-string-ordinal.svg \ +src/ui/gui/icons/scalable/categories/measure-currency-scale.svg \ +src/ui/gui/icons/scalable/categories/measure-currency-nominal.svg \ +src/ui/gui/icons/scalable/categories/measure-currency-ordinal.svg \ +src/ui/gui/icons/scalable/categories/role-input.svg \ +src/ui/gui/icons/scalable/categories/role-target.svg \ +src/ui/gui/icons/scalable/categories/role-both.svg \ +src/ui/gui/icons/scalable/categories/role-none.svg \ +src/ui/gui/icons/scalable/categories/role-partition.svg \ +src/ui/gui/icons/scalable/categories/role-split.svg + +# Mimetype icons have size dependent layouts MIMETYPE_ICONS = \ -src/ui/gui/icons/32x32/mimetypes/application-x-spss-por.png \ -src/ui/gui/icons/32x32/mimetypes/application-x-spss-sav.png \ -src/ui/gui/icons/32x32/mimetypes/application-x-spss-sps.png \ -src/ui/gui/icons/32x32/mimetypes/application-x-spss-zsav.png \ +src/ui/gui/icons/16x16/mimetypes/application-x-spss-por.png \ +src/ui/gui/icons/16x16/mimetypes/application-x-spss-sav.png \ +src/ui/gui/icons/16x16/mimetypes/application-x-spss-sps.png \ +src/ui/gui/icons/16x16/mimetypes/application-x-spss-zsav.png \ src/ui/gui/icons/22x22/mimetypes/application-x-spss-por.png \ src/ui/gui/icons/22x22/mimetypes/application-x-spss-sav.png \ src/ui/gui/icons/22x22/mimetypes/application-x-spss-sps.png \ @@ -170,19 +224,18 @@ src/ui/gui/icons/24x24/mimetypes/application-x-spss-por.png \ src/ui/gui/icons/24x24/mimetypes/application-x-spss-sav.png \ src/ui/gui/icons/24x24/mimetypes/application-x-spss-sps.png \ src/ui/gui/icons/24x24/mimetypes/application-x-spss-zsav.png \ -src/ui/gui/icons/256x256/mimetypes/application-x-spss-por.png \ -src/ui/gui/icons/256x256/mimetypes/application-x-spss-sav.png \ -src/ui/gui/icons/256x256/mimetypes/application-x-spss-sps.png \ -src/ui/gui/icons/256x256/mimetypes/application-x-spss-zsav.png \ -src/ui/gui/icons/16x16/mimetypes/application-x-spss-por.png \ -src/ui/gui/icons/16x16/mimetypes/application-x-spss-sav.png \ -src/ui/gui/icons/16x16/mimetypes/application-x-spss-sps.png \ -src/ui/gui/icons/16x16/mimetypes/application-x-spss-zsav.png \ +src/ui/gui/icons/32x32/mimetypes/application-x-spss-por.png \ +src/ui/gui/icons/32x32/mimetypes/application-x-spss-sav.png \ +src/ui/gui/icons/32x32/mimetypes/application-x-spss-sps.png \ +src/ui/gui/icons/32x32/mimetypes/application-x-spss-zsav.png \ src/ui/gui/icons/48x48/mimetypes/application-x-spss-por.png \ src/ui/gui/icons/48x48/mimetypes/application-x-spss-sav.png \ src/ui/gui/icons/48x48/mimetypes/application-x-spss-sps.png \ -src/ui/gui/icons/48x48/mimetypes/application-x-spss-zsav.png - +src/ui/gui/icons/48x48/mimetypes/application-x-spss-zsav.png \ +src/ui/gui/icons/256x256/mimetypes/application-x-spss-por.png \ +src/ui/gui/icons/256x256/mimetypes/application-x-spss-sav.png \ +src/ui/gui/icons/256x256/mimetypes/application-x-spss-sps.png \ +src/ui/gui/icons/256x256/mimetypes/application-x-spss-zsav.png src/ui/gui/artwork/splash-t.svg: src/ui/gui/artwork/splash.svg cp $< $@ @@ -190,128 +243,63 @@ src/ui/gui/artwork/splash-t.svg: src/ui/gui/artwork/splash.svg src/ui/gui/artwork/splash-r.svg: src/ui/gui/artwork/splash.svg sed -e '/inkscape:label="Overlay"/s/inline/none/' $< > $@ - MISC_ICONS = src/ui/gui/icons/splash-t.png \ src/ui/gui/icons/splash-r.png - ACTION_ICONS = \ -src/ui/gui/icons/32x32/actions/data-split-file.png \ -src/ui/gui/icons/32x32/actions/data-select-cases.png \ -src/ui/gui/icons/32x32/actions/data-weight-cases.png \ -src/ui/gui/icons/32x32/actions/transform-compute.png \ -src/ui/gui/icons/32x32/actions/edit-find.png \ -src/ui/gui/icons/32x32/actions/edit-go-to-case.png \ -src/ui/gui/icons/32x32/actions/edit-go-to-variable.png \ -src/ui/gui/icons/32x32/actions/edit-insert-case.png \ -src/ui/gui/icons/32x32/actions/edit-insert-variable.png \ -src/ui/gui/icons/32x32/actions/edit-cut.png \ -src/ui/gui/icons/32x32/actions/edit-copy.png \ -src/ui/gui/icons/32x32/actions/edit-paste.png \ -src/ui/gui/icons/32x32/actions/edit-undo.png \ -src/ui/gui/icons/32x32/actions/edit-redo.png \ -src/ui/gui/icons/32x32/actions/edit-select-all.png \ -src/ui/gui/icons/32x32/actions/file-open-data.png \ -src/ui/gui/icons/32x32/actions/file-save-data.png \ -src/ui/gui/icons/32x32/actions/file-export-data.png \ -src/ui/gui/icons/32x32/actions/file-print.png \ -src/ui/gui/icons/32x32/actions/view-value-labels.png \ -src/ui/gui/icons/32x32/actions/utilities-variables.png \ -src/ui/gui/icons/32x32/actions/run-all.png \ -src/ui/gui/icons/24x24/actions/data-split-file.png \ -src/ui/gui/icons/24x24/actions/data-select-cases.png \ -src/ui/gui/icons/24x24/actions/data-weight-cases.png \ -src/ui/gui/icons/24x24/actions/transform-compute.png \ -src/ui/gui/icons/24x24/actions/edit-find.png \ -src/ui/gui/icons/24x24/actions/edit-go-to-case.png \ -src/ui/gui/icons/24x24/actions/edit-go-to-variable.png \ -src/ui/gui/icons/24x24/actions/edit-insert-case.png \ -src/ui/gui/icons/24x24/actions/edit-insert-variable.png \ -src/ui/gui/icons/24x24/actions/edit-cut.png \ -src/ui/gui/icons/24x24/actions/edit-copy.png \ -src/ui/gui/icons/24x24/actions/edit-paste.png \ -src/ui/gui/icons/24x24/actions/edit-undo.png \ -src/ui/gui/icons/24x24/actions/edit-redo.png \ -src/ui/gui/icons/24x24/actions/edit-select-all.png \ -src/ui/gui/icons/24x24/actions/file-open-data.png \ -src/ui/gui/icons/24x24/actions/file-save-data.png \ -src/ui/gui/icons/24x24/actions/file-export-data.png \ -src/ui/gui/icons/24x24/actions/file-print.png \ -src/ui/gui/icons/24x24/actions/view-value-labels.png \ -src/ui/gui/icons/24x24/actions/utilities-variables.png \ -src/ui/gui/icons/24x24/actions/run-all.png \ -src/ui/gui/icons/16x16/actions/file-new-data.png \ -src/ui/gui/icons/16x16/actions/file-syntax-data.png \ -src/ui/gui/icons/16x16/actions/file-system-data.png \ -src/ui/gui/icons/16x16/actions/file-open-data.png \ -src/ui/gui/icons/16x16/actions/file-import-data.png \ -src/ui/gui/icons/16x16/actions/file-export-data.png \ -src/ui/gui/icons/16x16/actions/file-save-data.png \ -src/ui/gui/icons/16x16/actions/file-save-as.png \ -src/ui/gui/icons/16x16/actions/file-print.png \ -src/ui/gui/icons/16x16/actions/file-rename-data-set.png \ -src/ui/gui/icons/16x16/actions/file-display-information.png \ -src/ui/gui/icons/16x16/actions/display-information-working-file.png \ -src/ui/gui/icons/16x16/actions/display-information-external-file.png \ -src/ui/gui/icons/16x16/actions/file-recently-used.png \ -src/ui/gui/icons/16x16/actions/file-quit.png \ -src/ui/gui/icons/16x16/actions/file-display-information.png \ -src/ui/gui/icons/16x16/actions/edit-insert-variable.png \ -src/ui/gui/icons/16x16/actions/edit-insert-case.png \ -src/ui/gui/icons/16x16/actions/edit-go-to-variable.png \ -src/ui/gui/icons/16x16/actions/edit-go-to-case.png \ -src/ui/gui/icons/16x16/actions/edit-cut.png \ -src/ui/gui/icons/16x16/actions/edit-copy.png \ -src/ui/gui/icons/16x16/actions/edit-paste.png \ -src/ui/gui/icons/16x16/actions/edit-delete.png \ -src/ui/gui/icons/16x16/actions/edit-undo.png \ -src/ui/gui/icons/16x16/actions/edit-redo.png \ -src/ui/gui/icons/16x16/actions/edit-select-all.png \ -src/ui/gui/icons/16x16/actions/edit-clear.png \ -src/ui/gui/icons/16x16/actions/edit-find.png \ -src/ui/gui/icons/16x16/actions/view-font.png \ -src/ui/gui/icons/16x16/actions/view-value-labels.png \ -src/ui/gui/icons/16x16/actions/data-sort-cases.png \ -src/ui/gui/icons/16x16/actions/data-transpose.png \ -src/ui/gui/icons/16x16/actions/data-aggregate.png \ -src/ui/gui/icons/16x16/actions/data-split-file.png \ -src/ui/gui/icons/16x16/actions/data-select-cases.png \ -src/ui/gui/icons/16x16/actions/data-weight-cases.png \ -src/ui/gui/icons/16x16/actions/run-all.png \ -src/ui/gui/icons/16x16/actions/run-selection.png \ -src/ui/gui/icons/16x16/actions/run-current-line.png \ -src/ui/gui/icons/16x16/actions/run-to-end.png \ -src/ui/gui/icons/16x16/actions/transform-compute.png \ -src/ui/gui/icons/16x16/actions/transform-count.png \ -src/ui/gui/icons/16x16/actions/transform-rank-cases.png \ -src/ui/gui/icons/16x16/actions/transform-automatic-recode.png \ -src/ui/gui/icons/16x16/actions/transform-in-to-same-variables.png \ -src/ui/gui/icons/16x16/actions/transform-in-to-different-variables.png \ -src/ui/gui/icons/16x16/actions/transform-run-pending.png \ -src/ui/gui/icons/16x16/actions/analyze-descriptive-statistics.png \ -src/ui/gui/icons/16x16/actions/analyze-compare-means.png \ -src/ui/gui/icons/16x16/actions/analyze-univariate-analysis.png \ -src/ui/gui/icons/16x16/actions/analyze-bivariate-correlation.png \ -src/ui/gui/icons/16x16/actions/analyze-kmeans-cluster.png \ -src/ui/gui/icons/16x16/actions/analyze-factor-analysis.png \ -src/ui/gui/icons/16x16/actions/analyze-reliability.png \ -src/ui/gui/icons/16x16/actions/analyze-regression.png \ -src/ui/gui/icons/16x16/actions/analyze-non-parametric-statistics.png \ -src/ui/gui/icons/16x16/actions/analyze-roc-curve.png \ -src/ui/gui/icons/16x16/actions/utilities-variables.png \ -src/ui/gui/icons/16x16/actions/utilities-data-file-comments.png \ -src/ui/gui/icons/16x16/actions/windows-minimize-all.png \ -src/ui/gui/icons/16x16/actions/windows-split.png \ -src/ui/gui/icons/16x16/actions/help-reference-manual.png \ -src/ui/gui/icons/16x16/actions/help-about.png - +src/ui/gui/icons/24x24/actions/pspp-file-open-data.png \ +src/ui/gui/icons/24x24/actions/pspp-file-save-data.png \ +src/ui/gui/icons/24x24/actions/pspp-edit-go-to-variable.png \ +src/ui/gui/icons/24x24/actions/pspp-edit-go-to-case.png \ +src/ui/gui/icons/24x24/actions/pspp-edit-find.png \ +src/ui/gui/icons/24x24/actions/pspp-edit-insert-case.png \ +src/ui/gui/icons/24x24/actions/pspp-edit-insert-variable.png \ +src/ui/gui/icons/24x24/actions/pspp-data-split-file.png \ +src/ui/gui/icons/24x24/actions/pspp-data-weight-cases.png \ +src/ui/gui/icons/24x24/actions/pspp-view-value-labels.png \ +src/ui/gui/icons/48x48/actions/pspp-file-open-data.png \ +src/ui/gui/icons/48x48/actions/pspp-file-save-data.png \ +src/ui/gui/icons/48x48/actions/pspp-edit-go-to-variable.png \ +src/ui/gui/icons/48x48/actions/pspp-edit-go-to-case.png \ +src/ui/gui/icons/48x48/actions/pspp-edit-find.png \ +src/ui/gui/icons/48x48/actions/pspp-edit-insert-case.png \ +src/ui/gui/icons/48x48/actions/pspp-edit-insert-variable.png \ +src/ui/gui/icons/48x48/actions/pspp-data-split-file.png \ +src/ui/gui/icons/48x48/actions/pspp-data-weight-cases.png \ +src/ui/gui/icons/48x48/actions/pspp-view-value-labels.png \ +src/ui/gui/icons/96x96/actions/pspp-file-open-data.png \ +src/ui/gui/icons/96x96/actions/pspp-file-save-data.png \ +src/ui/gui/icons/96x96/actions/pspp-edit-go-to-variable.png \ +src/ui/gui/icons/96x96/actions/pspp-edit-go-to-case.png \ +src/ui/gui/icons/96x96/actions/pspp-edit-find.png \ +src/ui/gui/icons/96x96/actions/pspp-edit-insert-case.png \ +src/ui/gui/icons/96x96/actions/pspp-edit-insert-variable.png \ +src/ui/gui/icons/96x96/actions/pspp-data-split-file.png \ +src/ui/gui/icons/96x96/actions/pspp-data-weight-cases.png \ +src/ui/gui/icons/96x96/actions/pspp-view-value-labels.png \ +src/ui/gui/icons/scalable/actions/pspp-file-open-data.svg \ +src/ui/gui/icons/scalable/actions/pspp-file-save-data.svg \ +src/ui/gui/icons/scalable/actions/pspp-edit-go-to-variable.svg \ +src/ui/gui/icons/scalable/actions/pspp-edit-go-to-case.svg \ +src/ui/gui/icons/scalable/actions/pspp-edit-find.svg \ +src/ui/gui/icons/scalable/actions/pspp-edit-insert-case.svg \ +src/ui/gui/icons/scalable/actions/pspp-edit-insert-variable.svg \ +src/ui/gui/icons/scalable/actions/pspp-data-split-file.svg \ +src/ui/gui/icons/scalable/actions/pspp-data-weight-cases.svg \ +src/ui/gui/icons/scalable/actions/pspp-view-value-labels.svg ICONS=$(CATEGORY_ICONS) $(ACTION_ICONS) $(MIMETYPE_ICONS) $(APP_ICONS) $(MISC_ICONS) +ICON_SOURCES = $(wildcard src/ui/gui/artwork/*/*/*.svg) +ICON_SOURCES += $(wildcard src/ui/gui/artwork/splash*.svg) + everything: prep_ph icons $(MAKE) -f Smake Makefile.in configure icons: $(ICONS) +clean-icons: + rm -f $(ICONS) +.PHONY: icons clean-icons src/ui/gui/icons/manifest: $(MAKEFILE_LIST) $(RM) $@ @@ -323,9 +311,8 @@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST) echo >> $@ echo >> $@ printf 'icon_srcs = ' >> $@ - for i in $(ICONS); do \ - printf ' \\\n\t ' >> $@ ;\ - printf $$i | awk '{ gsub(".png",".svg")gsub("icons","artwork");printf $$0}' >> $@ ; \ + for i in $(ICON_SOURCES); do \ + printf ' \\\n\t '$$i >> $@ ;\ done echo ' ' >> $@ echo >> $@ @@ -344,10 +331,11 @@ src/ui/gui/resources.xml: $(ICONS) .PHONY: prep_ph -prep_ph: +prep_ph: test -e ChangeLog || touch ChangeLog test -d m4 || mkdir m4 touch m4/Makefile.am + touch build-aux/config.rpath $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \ --source-base=gl --lib=libgl --tests-base=tests \ --doc-base=gl/doc --aux-dir=build-aux \ @@ -402,26 +390,31 @@ po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header \ po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po \ po/Makevars.template po/pspp.pot -clean: +clean: clean-icons rm -f config.sub config.guess config.rpath rm -fr autom4te.cache rm -f aclocal.m4 rm -f missing mkinstalldirs rm -f install-sh - rm -f configure Makefile + rm -f configure Makefile rm -f depcomp rm -rf intl gl rm -f m4/*.m4 - rm -f $(PO_FILES) po/*.gmo + rm -f $(PO_FILES) po/*.gmo rm -f mdate-sh texinfo.tex rm -f doc/stamp-vti rm -f config.h.in~ rm -f config.h.in rm -f gl/Makefile.in rm -f Makefile.in - rm -f compile - rm -f ltmain.sh - rm -f reloc-ldflags install-reloc + rm -f build-aux/compile + rm -f build-aux/ltmain.sh + rm -f build-aux/reloc-ldflags + rm -f build-aux/install-reloc + rm -f build-aux/config.rpath + rm -f build-aux/config.libpath + rm -f build-aux/libtool-reloc + rm -f build-aux/gitlog-to-changelog .PHONY: all gettextize clean @@ -432,11 +425,66 @@ clean: #svg2png=convert -background transparent $1 $3 +# Graphical layout of icons and our portfolio +# =========================================== +# +# We have two different kinds of icons in our artwork collection +# +# a) The mimetype icons have a different graphical layout depending on resolution +# This assumes that a higher resolution means a bigger size. On the bigger +# size you can identify more details and this is used in the design. +# b) Icons which are designed based on 16x16 pixels which are just scaled +# This are all other icons. +# +# Icon resolutions +# +# The different icon resolutions are historically derived for bitmaps when an icon +# is displayed in different sizes. Then a scaled version of the icon requires a new +# bitmap image. All our icons are now svg type and can be scaled from one svg file as +# the names suggests - scalable vector format. +# +# The strategy for pspp gui +# +# All icons which are simply scaled provide a default 48x48 bitmap png image plus +# an svg version in the scalable directory. +# The mimetype icons with different layouts provide png bitmaps in their original resolutions +# +# The artwork directory contains only the pure source svg files. No copies and no +# version has another size indication although it is an svg. +# +# => mimetype icons are located in 16x16, 32x32, ... , 256x256 (different designs) +# => all others are in scaled (just one design svg) +# + +# Rule for icons with size dependent graphical design src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 mkdir -p $(dir $@) build-aux/svg2png "$<" "$(lastword $^)" "$@" +# Rules for icons which are simply scaled - Attention multitarget would trigger only once... +src/ui/gui/icons/16x16/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +src/ui/gui/icons/22x22/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +src/ui/gui/icons/24x24/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +src/ui/gui/icons/32x32/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +src/ui/gui/icons/48x48/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +src/ui/gui/icons/96x96/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +src/ui/gui/icons/256x256/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" +# Copy svg src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg mkdir -p $(dir $@) cp $< $@