summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-03 07:49:45 +1100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-03 07:49:45 +1100
commitec1998216fb636cba8fb798bb677caaeb42f9a68 (patch)
tree329d33c2d93166d8012286ff256deea066ff1e0f /Makefile
parent99dbd667bf2a40f2ea8444780310114e353f4557 (diff)
parentce87c26c0049336ec62ebcf03a93c589c8818d20 (diff)
downloadsubsurface-ec1998216fb636cba8fb798bb677caaeb42f9a68.tar.gz
Merge branch 'subsurface-icon' of github.com:henrik242/subsurface
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index da838bac9..ba8fdc0f6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ XSLTDIR = $(DATADIR)/subsurface/xslt
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
NAME = subsurface
-ICONFILE = $(NAME).svg
+ICONFILE = $(NAME)-icon.svg
DESKTOPFILE = $(NAME).desktop
MANFILES = $(NAME).1
XSLTFILES = xslt/*.xslt
@@ -249,15 +249,17 @@ share/locale/%.UTF-8/LC_MESSAGES/subsurface.mo: po/%.po po/%.aliases
done; \
fi
-# this should work but it doesn't preserve the transparancy - so I manually converted with gimp
-# satellite.png: satellite.svg
-# convert -resize 11x16 -depth 8 satellite.svg satellite.png
+satellite.png: satellite.svg
+ convert -transparent white -resize 11x16 -depth 8 $< $@
+
+# This should work, but it doesn't get the colors quite right - so I manually converted with Gimp
+# convert -colorspace RGB -transparent white -resize 256x256 subsurface-icon.svg subsurface-icon.png
#
-# the following creates the pixbuf data in .h files with the basename followed by '_pixmap'
+# The following creates the pixbuf data in .h files with the basename followed by '_pixmap'
# as name of the data structure
%.h: %.png
@echo ' gdk-pixbuf-csource' $<
- @gdk-pixbuf-csource --struct --name $*_pixbuf $< > $@
+ @gdk-pixbuf-csource --struct --name `echo $* | sed 's/-/_/g'`_pixbuf $< > $@
doc:
$(MAKE) -C Documentation doc