tidy up

3 files changed, 28 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index ce74c24..fb33286 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
-# SVG2PNG: Each is buggy in their own way
-# ImageMagick: doesn't support transparency
-#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $(if $5,-bacground $5) $2
-# librsvg: doesn't support <style> element
+## SVG2PNG: Each is buggy in their own way
+## Usage: $(call SVG2PNG,infile,outfile[,width,height,background-color])
+##
+## ImageMagick: doesn't support transparency
+#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $(if $5,-background $5) $2
+## librsvg: doesn't support <style> element
 #SVG2PNG = rsvg-convert $1 -o $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,--background-color=$5)
-# Inkscape: messes up gradients
+## Inkscape: messes up gradients
 SVG2PNG = inkscape $1 --export-png $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,-b '$5')
 
-# pngcrush is available from [pcr]
 #PNGCRUSH = cp $1 $2
 PNGCRUSH = pngcrush $1 $2
 
 default: PHONY all
 
+
+
 dir.png     = /usr/share/icons/oxygen/16x16/mimetypes/inode-directory.png
 file.png    = /usr/share/icons/oxygen/16x16/mimetypes/unknown.png
 iso.png     = /usr/share/icons/oxygen/16x16/devices/media-optical.png
@@ -22,18 +25,31 @@ tar.png     = tar.svg.png
 torrent.png = /usr/share/icons/oxygen/16x16/actions/download.png
 txt.png     = /usr/share/icons/oxygen/16x16/mimetypes/text-plain.png
 
+# TODO: get the Arch and Parabola icons
+
+# 'tar.svg' is derived from
+#   '/usr/share/icons/oxygen/scalable/places/small/16x16/folder-tar.svgz'
+
+# 'pkg.svg' is derived from 'tar.svg'
+
+
+
 pngs := $(shell sed -n 's/\.png\s*=.*/.png/p' $(MAKEFILE_LIST))
 $(foreach png,$(pngs),$(eval $(png): $($(png)); $$(call PNGCRUSH,$$<,$$@)))
 
 all: PHONY $(pngs) .gitignore
-
 clean: PHONY
-	rm -f -- $(pngs) *.svg.png
+	rm -f -- *.svg.png
+distclean: PHONY clean
+	rm -f -- $(pngs)
+
 .gitignore: $(MAKEFILE_LIST)
 	printf '%s\n' '*~' '*.svg.png' $(pngs) | LC_COLLATE=C sort > .gitignore
 
 %.svg.png: %.svg
 	$(call SVG2PNG,$<,$@,16)
 
+
+
 .PHONY: PHONY
 .DELETE_ON_ERROR:
diff --git a/pkg.svg b/pkg.svg
index 6adbea2..603c667 100644
--- a/pkg.svg
+++ b/pkg.svg
@@ -16,9 +16,9 @@
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
    version="1.0"
-   sodipodi:docname="folder-tar.svg"
+   sodipodi:docname="pkg.svg"
    inkscape:output_extension="org.inkscape.output.svgz.inkscape"
-   inkscape:export-filename="/home/luke/icons/folder-tar.png"
+   inkscape:export-filename="pkg.svg.png"
    inkscape:export-xdpi="11.25"
    inkscape:export-ydpi="11.25">
   <defs
diff --git a/tar.svg b/tar.svg
index 5fde86e..29f83b0 100644
--- a/tar.svg
+++ b/tar.svg
@@ -16,9 +16,9 @@
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
    version="1.0"
-   sodipodi:docname="pkg.svg"
+   sodipodi:docname="tar.svg"
    inkscape:output_extension="org.inkscape.output.svgz.inkscape"
-   inkscape:export-filename="/home/luke/icons/folder-tar.png"
+   inkscape:export-filename="tar.svg.png"
    inkscape:export-xdpi="11.25"
    inkscape:export-ydpi="11.25">
   <defs