altosdroid: Deal with AltosState changes

[fw/altos] / icon / Makefile.am

diff --git a/icon/Makefile.am b/icon/Makefile.am
index bf147ad37fd33ff12081c42c7a4afe6649a3eb95..af238ac42527da025ff403481c046ba58146b0b7 100644 (file)
--- a/icon/Makefile.am
+++ b/icon/Makefile.am
@@ -85,8 +85,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
@@ -116,9 +118,11 @@ clean-local:
        $(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON)
        $(RM) altusmetrum.xpm
 
+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
 
 $(MPD_ICON): $(MP_ICON)
        $(LN_S) $(MP_ICON) $@
@@ -146,14 +150,21 @@ 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