projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[fw/altos]
/
icon
/
Makefile.am
diff --git
a/icon/Makefile.am
b/icon/Makefile.am
index db5577d6454fdf14a5dcfa045b503b2c751bedbf..b1c00f4b4e50415ee3b466d431f1ef8f6a05226e 100644
(file)
--- a/
icon/Makefile.am
+++ b/
icon/Makefile.am
@@
-1,15
+1,20
@@
-LINUX_RES=16 32 48 64 128 256 512
+JAVA_RES=16 32 48 64 128 256
MAC_RES=16 32 128 256 512
WIN_RES=16 24 32 48 64 72 96 128 180 256
MAC_RES=16 32 128 256 512
WIN_RES=16 24 32 48 64 72 96 128 180 256
-RES=$(shell echo $(
LINUX
_RES) $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u)
+RES=$(shell echo $(
JAVA
_RES) $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u)
AM_FILES=$(shell for i in $(RES); do echo altus-metrum-$$i.png; done)
MP_FILES=$(shell for i in $(RES); do echo micropeak-$$i.png; done)
TG_FILES=$(shell for i in $(RES); do echo telegps-$$i.png; done)
AM_FILES=$(shell for i in $(RES); do echo altus-metrum-$$i.png; done)
MP_FILES=$(shell for i in $(RES); do echo micropeak-$$i.png; done)
TG_FILES=$(shell for i in $(RES); do echo telegps-$$i.png; done)
+
MAC_TG_FILES=$(shell for i in $(MAC_RES); do echo telegps-$$i.png; done)
MAC_MP_FILES=$(shell for i in $(MAC_RES); do echo micropeak-$$i.png; done)
MAC_AM_FILES=$(shell for i in $(MAC_RES); do echo altus-metrum-$$i.png; done)
MAC_TG_FILES=$(shell for i in $(MAC_RES); do echo telegps-$$i.png; done)
MAC_MP_FILES=$(shell for i in $(MAC_RES); do echo micropeak-$$i.png; done)
MAC_AM_FILES=$(shell for i in $(MAC_RES); do echo altus-metrum-$$i.png; done)
+WIN_TG_FILES=$(shell for i in $(WIN_RES); do echo telegps-$$i.png; done)
+WIN_MP_FILES=$(shell for i in $(WIN_RES); do echo micropeak-$$i.png; done)
+WIN_AM_FILES=$(shell for i in $(WIN_RES); do echo altus-metrum-$$i.png; done)
+
ICO_FILES=altus-metrum.ico micro-peak.ico telegps.ico
ICNS_FILES=AltosUIIcon.icns TeleGPS.icns MicroPeak.icns
ICO_FILES=altus-metrum.ico micro-peak.ico telegps.ico
ICNS_FILES=AltosUIIcon.icns TeleGPS.icns MicroPeak.icns
@@
-29,34
+34,34
@@
res:
all-local: $(ICO_FILES) $(ICNS_FILES)
clean-local:
all-local: $(ICO_FILES) $(ICNS_FILES)
clean-local:
- $(RM)
$(TG_FILES) $(MP_FILES) $(ICO_FILES) $(ICNS_FILES) *.build
+ $(RM)
altus-metrum-*.png telegps-*.png micropeak-*.png *.build *.ico *.icns
$(AM_FILES): altusmetrum.build
altusmetrum.build: altusmetrum.svg
$(AM_FILES): altusmetrum.build
altusmetrum.build: altusmetrum.svg
- for i in $(RES); do
./make-png altusmetrum.svg $$i altus-metrum-$$i.pn
g; done && touch $@
+ for i in $(RES); do
rsvg-convert -w $$i -h $$i -o altus-metrum-$$i.png altusmetrum.sv
g; done && touch $@
$(TG_FILES): telegps.build
telegps.build: telegps.svg
$(TG_FILES): telegps.build
telegps.build: telegps.svg
- for i in $(RES); do
./make-png telegps.svg $$i telegps-$$i.pn
g; done && touch $@
+ for i in $(RES); do
rsvg-convert -w $$i -h $$i -o telegps-$$i.png telegps.sv
g; done && touch $@
$(MP_FILES): micropeak.build
micropeak.build: micropeak.svg
$(MP_FILES): micropeak.build
micropeak.build: micropeak.svg
- for i in $(RES); do
./make-png micropeak.svg $$i micropeak-$$i.pn
g; done && touch $@
+ for i in $(RES); do
rsvg-convert -w $$i -h $$i -o micropeak-$$i.png micropeak.sv
g; done && touch $@
#clean-local:
# $(RM) -f $(ICO_FILES)
#clean-local:
# $(RM) -f $(ICO_FILES)
-altus-metrum.ico: $(AM_FILES)
- icotool -c -o $@ $(AM_FILES)
+altus-metrum.ico: $(
WIN_
AM_FILES)
+ icotool -c -o $@ $(
WIN_
AM_FILES)
-micro-peak.ico: $(MP_FILES)
- icotool -c -o $@ $(MP_FILES)
+micro-peak.ico: $(
WIN_
MP_FILES)
+ icotool -c -o $@ $(
WIN_
MP_FILES)
-telegps.ico: $(TG_FILES)
- icotool -c -o $@ $(TG_FILES)
+telegps.ico: $(
WIN_
TG_FILES)
+ icotool -c -o $@ $(
WIN_
TG_FILES)
AltosUIIcon.icns: $(MAC_AM_FILES)
png2icns $@ $(MAC_AM_FILES)
AltosUIIcon.icns: $(MAC_AM_FILES)
png2icns $@ $(MAC_AM_FILES)