X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=56554697196ab925fccb18fa8ce33b95274ee646;hp=f5b83ce7c7ede2ff85c0a28a990dd73f49206ed9;hb=09e0c304b420a12fa1616005db946523c6e5bef1;hpb=cf03ab3383b679e6617e8ab7004be91e5a727562

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index f5b83ce7..56554697 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -30,7 +30,6 @@ altosui_JAVA = \
 	AltosConfigTDUI.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
-	AltosDebug.java \
 	AltosDescent.java \
 	AltosDeviceUIDialog.java \
 	AltosDisplayThread.java \
@@ -50,7 +49,6 @@ altosui_JAVA = \
 	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
 	AltosFreqList.java \
-	AltosHexfile.java \
 	Altos.java \
 	AltosIdleMonitorUI.java \
 	AltosIgniteUI.java \
@@ -63,7 +61,6 @@ altosui_JAVA = \
 	AltosLights.java \
 	AltosPad.java \
 	AltosUIPreferencesBackend.java \
-	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosScanUI.java \
 	AltosSerial.java \
@@ -74,10 +71,9 @@ altosui_JAVA = \
 	AltosSiteMapTile.java \
 	AltosUI.java \
 	AltosWriter.java \
-	AltosDataPointReader.java \
-	AltosDataPoint.java \
 	AltosGraph.java \
-	AltosGraphTime.java \
+	AltosGraphDataPoint.java \
+	AltosGraphDataSet.java \
 	AltosGraphUI.java \
 	AltosDataChooser.java \
 	AltosVoice.java \
@@ -99,10 +95,10 @@ FREETTS_CLASS= \
 	freetts.jar
 
 ALTOSLIB_CLASS=\
-	AltosLib.jar
+	altoslib_$(ALTOSLIB_VERSION).jar
 
 ALTOSUILIB_CLASS=\
-	altosuilib.jar
+	altosuilib_$(ALTOSUILIB_VERSION).jar
 
 LIBALTOS= \
 	libaltos.so \
@@ -158,7 +154,7 @@ FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD)
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
 TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
-TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/megametrum-outline.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/telemega-outline.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
@@ -183,7 +179,7 @@ all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
 		$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
-		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
 		altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL