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

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index d494547b..feda00c7 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -27,8 +27,6 @@ altosui_JAVA = \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
-	AltosConvert.java \
-	AltosCRCException.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDebug.java \
@@ -42,12 +40,6 @@ altosui_JAVA = \
 	AltosEepromList.java \
 	AltosEepromManage.java \
 	AltosEepromMonitor.java \
-	AltosEepromTeleScience.java \
-	AltosEepromMega.java \
-	AltosEepromMegaIterable.java \
-	AltosMs5607.java \
-	AltosIMU.java \
-	AltosMag.java \
 	AltosEepromSelect.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
@@ -259,7 +251,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 +267,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 +285,7 @@ $(ALTOSLIB_CLASS):
 	-rm -f "$@"
 	$(LN_S) ../altoslib/"$@" .
 
-$(FREETTS_CLASS): ../altoslib/"$@"
+$(FREETTS_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(FREETTS)"/"$@" .