cleaned working directory and simplified installation, mimetype previews

now possible

1 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index ac4cf99..7e5b4ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
-all: clean
-        make generate
+all: actions apps categories devices emblems places status mimetypes-templates
         
-generate: preview.png versions update-cache
+%.png:
+        rm -f $@
 
-preview.png:
-        #$(shell find "scalable/" -type f -name "*.png" -not -path ".git/*" -not -path 'scalable/animations/*' -not -path 'scalable/mimetypes/*' | sort | feh -m -y 96 -E 96 -s -p -b trans -O preview.png -f-)
-        $(shell for path in $(ls -d scalable/*/); do montage -label '\n%t'  $(find $path -type f) -tile 5 -background white -geometry 96x96+24+24  doc/img/$(echo $path | cut -d "/" -f2).jpg; done)
+%: %.png
+        $(shell /usr/bin/env montage -label '\n%t'  $(shell find scalable/$(@) -type f) -tile 5 -background white -geometry 96x96+24+24  doc/img/$(@).jpg)
 
-preview_mimetypes.png:
-        $(shell find "scalable/mimetypes" -type f -name "*.png" | sort | feh -m -y 256 -E 256 -W 8192 -s -p -b trans -O preview_mimetypes.png -f-)
+mimetypes:
+        ./icons-mkmimetypes.sh /usr/share/mime/generic-icons 
+        ./icons-mkmimetypes.sh /usr/share/mime/globs
 
-versions:
-        find scalable/ -name '*.png' -exec ./generate.sh '{}' \;
+resize:
+        find scalable/ -name '*.png' -exec ./icons-mkdefaultsizes.sh '{}' \;
 
-update-cache:
+iconcache:
         gtk-update-icon-cache `pwd`
 
 clean: