altos/test: Adjust CRC error rate after FEC fix

[fw/altos] / icon / Makefile.am

diff --git a/icon/Makefile.am b/icon/Makefile.am
index bf147ad37fd33ff12081c42c7a4afe6649a3eb95..0f4389d0b5d5c08cdf6b18fdf6e5c1203ceb8e3b 100644 (file)
--- a/icon/Makefile.am
+++ b/icon/Makefile.am
@@ -1,7 +1,8 @@
 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
-RES=$(shell echo $(JAVA_RES) $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u)
+AMAZON_RES=114 512
+RES=$(shell echo $(JAVA_RES) $(MAC_RES) $(WIN_RES) $(AMAZON_RES)| awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u)
 
 # Application icon base names
 
@@ -27,6 +28,17 @@ EEPROM_ICON  = $(EEPROM_NAME).svg
 TELEM_ICON     = $(TELEM_NAME).svg
 MPD_ICON       = $(MPD_NAME).svg
 
+LED_SVG = \
+       redoff.svg \
+       greenoff.svg \
+       greenled.svg \
+       grayon.svg \
+       grayled.svg \
+       redled.svg
+LED_PNG = $(LED_SVG:.svg=.png)
+
+LED_ICONS = $(LED_SVG) $(LED_PNG)
+
 # Files needed for Mac OSX icons
 
 MAC_AM_FILES   = $(shell for i in $(MAC_RES); do echo $(AM_NAME)-$$i.png; done)
@@ -62,6 +74,10 @@ JAVA_TG_FILES        = $(shell for i in $(JAVA_RES); do echo $(TG_NAME)-$$i.png; done)
 
 JAVA_FILES     = $(JAVA_AM_FILES) $(JAVA_MP_FILES) $(JAVA_TG_FILES)
 
+# Files needed for Amazon store
+
+AMAZON_FILES   = $(shell for i in $(AMAZON_RES); do echo $(AM_NAME)-$$i.png; done)
+
 # PNG files needed by anyone
 
 AM_FILES       = $(shell for i in $(RES); do echo $(AM_NAME)-$$i.png; done)
@@ -85,8 +101,10 @@ MIME_ICONS = $(EEPROM_ICON) $(TELEM_ICON) $(MPD_ICON)
 mimeicondir = $(ICON_THEME)/scalable/mimetypes
 mimeicon_DATA = $(MIME_ICONS)
 
+if INSTALL_SHARED_MIME_INFO
 mimedir = $(datadir)/mime/packages
 mime_DATA = org-altusmetrum-mimetypes.xml
+endif
 
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = altusmetrum.xpm
@@ -107,7 +125,7 @@ java-telegps:
 
 fat: all $(ICO_FILES) $(ICNS_FILES) $(EXE_FILES)
 
-all-local: $(JAVA_FILES) $(AM_XPM)
+all-local: $(JAVA_FILES) $(AM_XPM) $(LED_ICONS) $(AMAZON_FILES)
 
 clean-local:
        $(RM) $(AM_NAME)-*.png $(TG_NAME)-*.png $(MP_NAME)-*.png
@@ -115,10 +133,16 @@ clean-local:
        $(RM) $(EEPROM_NAME)-*.png $(TELEM_NAME)-*.png $(MPD_NAME)-*.png
        $(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON)
        $(RM) altusmetrum.xpm
+       $(RM) $(LED_ICONS)
 
+if INSTALL_SHARED_MIME_INFO
 install-data-hook:
-       update-mime-database $(datadir)/mime
-       update-icon-caches $(ICON_THEME)
+       update-mime-database $(DESTDIR)$(datadir)/mime
+       update-icon-caches $(DESTDIR)$(ICON_THEME)
+endif
+
+$(LED_ICONS): led.5c
+       nickle led.5c $@
 
 $(MPD_ICON): $(MP_ICON)
        $(LN_S) $(MP_ICON) $@
@@ -146,14 +170,24 @@ SUFFIXES=.svg .build .icns .ico .rc .o .exe
        icotool -c -o $@ $(shell for i in $(WIN_RES); do echo $*-$$i.png; done)
 
 .ico.rc:
-       echo '101 ICON "$*.ico"' > $@
+       ./make-rc "$*" $(VERSION) > $@
 
 
 MINGCC32=i686-w64-mingw32-gcc
 MINGWINDRES=i686-w64-mingw32-windres
+MINGFLAGS=-Wall -DWINDOWS -mwindows
+MINGLIBS=-lshlwapi
 
 .rc.o:
        $(MINGWINDRES) $*.rc $@
 
 .o.exe:
-       $(MINGCC32) -o $@ windows-stub.c $*.o
+       $(MINGCC32) -o $@ $(MINGFLAGS) windows-stub.o $*.o $(MINGLIBS)
+
+$(EXE_FILES): windows-stub.o make-rc
+
+windows-stub.o: windows-stub.c
+       $(MINGCC32) -c $(MINGFLAGS) windows-stub.c
+
+altosdroid.png: altosdroid.svg
+       rsvg-convert -a -b white -h 480 altosdroid.svg | pngtopnm | pnmpad -white -width 512 -height 512 | pnmtopng > $@