X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FMakefile.am;h=32a3df97ba9187d9704feebca4b22c9b20066742;hb=9001d5780a41986017bd3bbc7f8c5556b116c351;hp=dc34c444bc435c4e3cb6906a4169f3720f9dc3d6;hpb=8bff2822c242d2878b408b9c0d8a7647108ea4b1;p=fw%2Faltos

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index dc34c444..32a3df97 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -98,7 +98,8 @@ ALTOSUILIB_CLASS=\
 	altosuilib_$(ALTOSUILIB_VERSION).jar
 
 LIBALTOS= \
-	libaltos.so \
+	libaltos32.so \
+	libaltos64.so \
 	libaltos.dylib \
 	altos.dll
 
@@ -164,7 +165,7 @@ TEMPLATE_DOC=\
 	$(top_srcdir)/doc/telemetrum-outline.pdf \
 	$(top_srcdir)/doc/easymini-outline.pdf \
 	$(top_srcdir)/doc/telemega-outline.pdf \
-	$(top_srcdir)/doc/easymini-outline.pdf
+	$(top_srcdir)/doc/telemini.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
@@ -175,11 +176,7 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-if MULTI_ARCH
 LINUX_LIBS=libaltos32.so libaltos64.so
-else
-LINUX_LIBS=libaltos.so
-endif
 
 LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
@@ -271,10 +268,6 @@ altosui-jdb: Makefile
 	echo 'exec jdb -classpath "classes:./*:../libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
-libaltos.so: build-libaltos
-	-rm -f "$@"
-	$(LN_S) ../libaltos/.libs/"$@" .
-
 libaltos32.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
@@ -295,7 +288,9 @@ altos64.dll: ../libaltos/altos64.dll
 	-rm -f "$@"
 	$(LN_S) ../libaltos/"$@" .
 
-../libaltos/.libs/libaltos.so: build-libaltos
+../libaltos/.libs/libaltos64.so: ../libaltos/.libs/libaltos32.so
+
+../libaltos/.libs/libaltos32.so: build-libaltos
 
 ../libaltos/altos.dll: build-altos-dll