altosui/telegps/micropeak: Handle both MULTI_LIB and non-MULTI_LIB builds

[fw/altos] / telegps / Makefile.am

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 0b86329aada21be0d2daeeab816c73adaea83a05..3484b951f97d49553e83f3c58eb0daf6cfae0e51 100644 (file)
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -42,8 +42,14 @@ JAR=telegps.jar
 
 FATJAR=telegps-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
@@ -118,9 +124,8 @@ all-local: telegps-test telegps-jdb $(JAR)
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                TeleGPS-Linux-*.tar.bz2 TeleGPS-Mac-*.dmg TeleGPS-Windows-*.exe \
-               $(ALTOSLIB_CLASS) \
-               $(ALTOSUILIB_CLASS) \
-               $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
+               altoslib_*.jar altosuilib_*.jar \
+               $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(FREETTS_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
                telegps telegps-test telegps-jdb macosx linux windows telegps-windows.log \
                telegps-windows.nsi *.desktop
 
@@ -141,7 +146,7 @@ DOC=$(TELEGPS_DOC)
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
+LINUX_FILES=$(FAT_FILES) $(LIBALTOS_LINUX) $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
 LINUX_EXTRA=telegps-fat $(desktop_file).in
 
 MACOSX_INFO_PLIST=Info.plist
@@ -219,6 +224,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/"$@" .
@@ -231,6 +244,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