altosui: Move product definitions from AltosUI to AltosLib

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index d494547b383ad9d52881613dd0fb1fd53333d9af..feda00c711a95e640297174910aa86a147695784 100644 (file)
--- 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)"/"$@" .