X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=0a6ae59e748423c6c63a30272aca87073299d926;hp=d494547b383ad9d52881613dd0fb1fd53333d9af;hb=dd43a2ae7594f062a8980d1756a07488ee54b447;hpb=81465a20049da40cd8d3cda920d6585ffe87bfe3

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index d494547b..0a6ae59e 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -45,9 +45,6 @@ altosui_JAVA = \
 	AltosEepromTeleScience.java \
 	AltosEepromMega.java \
 	AltosEepromMegaIterable.java \
-	AltosMs5607.java \
-	AltosIMU.java \
-	AltosMag.java \
 	AltosEepromSelect.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
@@ -259,7 +256,7 @@ altosui-jdb: Makefile
 	echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
-libaltos.so:
+libaltos.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) libaltos/.libs/"$@" .
 
@@ -275,10 +272,14 @@ altos64.dll: libaltos/altos64.dll
 	-rm -f "$@"
 	$(LN_S) libaltos/"$@" .
 
+libaltos/.libs/libaltos.so: build-libaltos
+
 libaltos/altos.dll: build-altos-dll
 
 libaltos/altos64.dll: build-altos64-dll
 
+build-libaltos:
+	+cd libaltos && make libaltos.la
 build-altos-dll:
 	+cd libaltos && make altos.dll
 
@@ -289,7 +290,7 @@ $(ALTOSLIB_CLASS):
 	-rm -f "$@"
 	$(LN_S) ../altoslib/"$@" .
 
-$(FREETTS_CLASS): ../altoslib/"$@"
+$(FREETTS_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(FREETTS)"/"$@" .