X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=icon%2FMakefile.am;h=af238ac42527da025ff403481c046ba58146b0b7;hp=516c547cb159c219d981565b305333c1c5889e51;hb=fe76229618643f0af7eae965e7a8fc6c70410d27;hpb=1b0f56ddb2b85b68232c22a7a8b8744cb9ad76f9

diff --git a/icon/Makefile.am b/icon/Makefile.am
index 516c547c..af238ac4 100644
--- a/icon/Makefile.am
+++ b/icon/Makefile.am
@@ -71,6 +71,10 @@ EEPROM_FILES	= $(shell for i in $(RES); do echo $(EEPROM_NAME)-$$i.png; done)
 TELEM_FILES	= $(shell for i in $(RES); do echo $(TELEM_NAME)-$$i.png; done)
 IN_MPD_FILES	= $(shell for i in $(RES); do echo $(MPD_NAME)-$$i.png; done)
 
+# XPM file needed by debian
+
+AM_XPM = altusmetrum.xpm
+
 ICON_THEME=$(datadir)/icons/hicolor
 
 appicondir = $(ICON_THEME)/scalable/apps
@@ -81,8 +85,13 @@ 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
 
 EXTRA_DIST = $(appicon_DATA) $(mimeicon_DATA) $(mime_DATA) windows-stub.c
 
@@ -100,20 +109,31 @@ java-telegps:
 
 fat: all $(ICO_FILES) $(ICNS_FILES) $(EXE_FILES)
 
-all-local: $(JAVA_FILES)
+all-local: $(JAVA_FILES) $(AM_XPM)
 
 clean-local:
 	$(RM) $(AM_NAME)-*.png $(TG_NAME)-*.png $(MP_NAME)-*.png
+	$(RM) altus-metrum-*.png micropeak-*.png telegps-*.png
 	$(RM) $(EEPROM_NAME)-*.png $(TELEM_NAME)-*.png $(MPD_NAME)-*.png
 	$(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) $@
 
+XPM_SRC=altusmetrum-altosui-32.png
+
+altusmetrum.xpm: $(XPM_SRC)
+	pngtopnm -alpha $(XPM_SRC) > mask-$@ && \
+		pngtopnm $(XPM_SRC) | \
+		ppmtoxpm -alphamask=mask-$@ > $@ && rm mask-$@
+
 $(AM_FILES): $(AM_NAME).build
 $(MP_FILES): $(MP_NAME).build
 $(TG_FILES): $(TG_NAME).build
@@ -130,13 +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