Reverted package name to 'altosui' from 'AltosUI'

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index d494547b383ad9d52881613dd0fb1fd53333d9af..9f75d5e38dd2decb1f1841deda959e7f6bbde2b2 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -6,7 +6,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos::$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=altosui
 
@@ -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 \
@@ -63,7 +55,6 @@ altosui_JAVA = \
        AltosHexfile.java \
        Altos.java \
        AltosIdleMonitorUI.java \
-       AltosIgnite.java \
        AltosIgniteUI.java \
        AltosLaunch.java \
        AltosLaunchUI.java \
@@ -159,7 +150,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
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/megametrum-outline.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
@@ -173,7 +164,8 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCO
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib
+MACOSX_INFO_PLIST=Info.plist
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@ -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)"/"$@" .
 
@@ -315,6 +311,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
        -rm -rf macosx
        mkdir macosx
        cp -a AltosUI.app macosx/
+       cp -p Info.plist macosx/AltosUI.app/Contents
        mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
        cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
        cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java