projects / fw / altos / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
altosui/telegps/micropeak: Handle both MULTI_LIB and non-MULTI_LIB builds
[fw/altos] / micropeak / Makefile.am
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 1a614cbdcac694719d9678d284572ecc2cb24e10..7ad2c102c191271e976bd32e5cd7a7b20ca6b00b 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT=classes
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 man_MANS=micropeak.1
 
@@ -40,8 +40,14 @@ JAR=micropeak.jar
 
 FATJAR=micropeak-fat.jar
 
+if MULTI_ARCH
+LIBALTOS_LINUX=libaltos32.so libaltos64.so
+else
+LIBALTOS_LINUX=libaltos.so
+endif
+
 LIBALTOS= \
-       libaltos.so \
+       $(LIBALTOS_LINUX) \
        libaltos.dylib \
        altos64.dll \
        altos.dll
@@ -56,35 +62,61 @@ ALTOSUILIB_CLASS=\
 ICONDIR=$(top_srcdir)/icon
 
 JAVA_ICONS=\
-       $(ICONDIR)/micropeak-16.png \
-       $(ICONDIR)/micropeak-32.png \
-       $(ICONDIR)/micropeak-48.png \
-       $(ICONDIR)/micropeak-64.png \
-       $(ICONDIR)/micropeak-128.png \
-       $(ICONDIR)/micropeak-256.png
+       $(ICONDIR)/altusmetrum-micropeak-16.png \
+       $(ICONDIR)/altusmetrum-micropeak-32.png \
+       $(ICONDIR)/altusmetrum-micropeak-48.png \
+       $(ICONDIR)/altusmetrum-micropeak-64.png \
+       $(ICONDIR)/altusmetrum-micropeak-128.png\
+       $(ICONDIR)/altusmetrum-micropeak-256.png
 
 # icon base names for jar
-ICONJAR= -C $(ICONDIR) micropeak-16.png \
-       -C $(ICONDIR) micropeak-32.png \
-       -C $(ICONDIR) micropeak-48.png \
-       -C $(ICONDIR) micropeak-64.png \
-       -C $(ICONDIR) micropeak-128.png \
-       -C $(ICONDIR) micropeak-256.png
-
-WINDOWS_ICON=$(ICONDIR)/micro-peak.ico
+ICONJAR= \
+       -C $(ICONDIR) altusmetrum-micropeak-16.png \
+       -C $(ICONDIR) altusmetrum-micropeak-32.png \
+       -C $(ICONDIR) altusmetrum-micropeak-48.png \
+       -C $(ICONDIR) altusmetrum-micropeak-64.png \
+       -C $(ICONDIR) altusmetrum-micropeak-128.png\
+       -C $(ICONDIR) altusmetrum-micropeak-256.png
+
+WINDOWS_ICONS  =\
+       ../icon/altusmetrum-micropeak.ico \
+       ../icon/altusmetrum-micropeak.exe
+       ../icon/application-vnd.altusmetrum.micropeak.ico \
+       ../icon/application-vnd.altusmetrum.micropeak.ico
+
+MACOSX_ICONS   =\
+       ../icon/altusmetrum-micropeak.icns \
+       ../icon/application-vnd.altusmetrum.micropeak.icns
+
+LINUX_ICONS    =\
+       $(ICONDIR)/altusmetrum-micropeak.svg \
+       $(ICONDIR)/application-vnd.altusmetrum.micropeak.svg
+
+LINUX_MIMETYPE =\
+       $(ICONDIR)/org-altusmetrum-mimetypes.xml
+
+desktopdir = $(datadir)/applications
+desktop_file = altusmetrum-micropeak.desktop
+desktop_SCRIPTS = $(desktop_file)
 
 all-local: micropeak-test micropeak-jdb $(JAR)
 
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                MicroPeak-Linux-*.tar.bz2 MicroPeak-Mac-*.dmg MicroPeak-Windows-*.exe \
-               $(ALTOSLIB_CLASS) \
-               $(ALTOSUILIB_CLASS) \
+               altoslib_*.jar altosuilib_*.jar \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
                micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
-               micropeak-windows.nsi
+               micropeak-windows.nsi *.desktop
+
+EXTRA_DIST = $(desktop_file).in
+
+$(desktop_file): $(desktop_file).in
+       sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
+       chmod +x $@
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
+LINUX_SH=MicroPeak-Linux-$(VERSION).sh
 MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
 WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe
 
@@ -94,40 +126,54 @@ DOC=$(MICROPEAK_DOC)
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
-LINUX_EXTRA=micropeak-fat
+LINUX_FILES=$(FAT_FILES) $(LIBALTOS_LINUX) $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
+LINUX_EXTRA=micropeak-fat $(desktop_file).in
+
+MACOSX_DRIVER_0_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
+MACOSX_DRIVER_0=FTDI_v2_2_18.dmg
+
+MACOSX_DRIVER_1_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_3.dmg
+MACOSX_DRIVER_1=FTDI_v2_3.dmg
+
+MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0)
 
-MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
-MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS)
+
+$(MACOSX_DRIVER_0):
+       wget -O $@ $(MACOSX_DRIVER_0_URL)
 
-$(MACOSX_DRIVER):
-       wget $(MACOSX_DRIVER_URL)
+$(MACOSX_DRIVER_1):
+       wget -O $@ $(MACOSX_DRIVER_1_URL)
 
-WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe
-WINDOWS_DRIVER=CDM20824_Setup.exe
+WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM%20v2.12.00%20WHQL%20Certified.exe
+WINDOWS_DRIVER=CDM_v2.12.00_WHQL_Certified.exe
 
 $(WINDOWS_DRIVER):
-       wget $(WINDOWS_DRIVER_URL)
+       wget -O "$(WINDOWS_DRIVER)" "$(WINDOWS_DRIVER_URL)"
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICON) $(WINDOWS_DRIVER)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDOWS_DRIVER)
 
 if FATINSTALL
 
 FATTARGET=$(FATDIR)/$(VERSION)
 
 LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
 MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
 WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
 
-fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
 
 $(LINUX_DIST_TARGET): $(LINUX_DIST)
        mkdir -p $(FATTARGET)
        cp -p $< $@
 
+$(LINUX_SH_TARGET): $(LINUX_SH)
+       mkdir -p $(FATTARGET)
+       cp -p $< $@
+
 $(MACOSX_DIST_TARGET): $(MACOSX_DIST)
        mkdir -p $(FATTARGET)
        cp -p $< $@
@@ -137,7 +183,7 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
        cp -p $< $@
 
 else
-fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
 micropeak: Makefile
@@ -179,6 +225,14 @@ libaltos.so: build-libaltos
        -rm -f "$@"
        $(LN_S) ../libaltos/.libs/"$@" .
 
+libaltos32.so: build-libaltos
+       -rm -f "$@"
+       $(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos64.so: build-libaltos
+       -rm -f "$@"
+       $(LN_S) ../libaltos/.libs/"$@" .
+
 libaltos.dylib:
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
@@ -191,6 +245,10 @@ altos64.dll: ../libaltos/altos64.dll
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
 
+../libaltos/.libs/libaltos64.so: ../libaltos/.libs/libaltos32.so
+
+../libaltos/.libs/libaltos32.so: build-libaltos
+
 ../libaltos/.libs/libaltos.so: build-libaltos
 
 ../libaltos/altos.dll: build-altos-dll
@@ -230,6 +288,10 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
        chmod +x linux/MicroPeak/micropeak
        tar cjf $@ -C linux MicroPeak
 
+$(LINUX_SH): $(LINUX_DIST) $(srcdir)/../altosui/linux-install.sh
+       sed 's/AltOS/MicroPeak/g' $(srcdir)/../altosui/linux-install.sh | cat - $(LINUX_DIST) > $@
+       chmod +x $@
+
 $(MACOSX_DIST): $(MACOSX_FILES)
        -rm -f $@
        -rm -rf macosx
@@ -238,8 +300,9 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        cp -a $(MACOSX_README) macosx/ReadMe.rtf
        cp -a $(DOC) macosx
        cp -p Info.plist macosx/MicroPeak.app/Contents
-       cp -p $(MACOSX_DRIVER) macosx
+       cp -p $(MACOSX_DRIVERS) macosx
        mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
+       cp -p $(MACOSX_ICONS) macosx/MicroPeak.app/Contents/Resources
        cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar
        cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(ALTOSLIB_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
@@ -250,7 +313,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
        -rm -f $@
-       makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi
+       makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1)
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
AltOS - the operating system for Altus Metrum products