altosui: Move java altoslib to top level

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index a168b6fc7d356136e8c1e4b8d8c16cc6e70367db..d494547b383ad9d52881613dd0fb1fd53333d9af 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=libaltos altoslib
+SUBDIRS=libaltos
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
@@ -6,7 +6,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:altoslib/bin:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 bin_SCRIPTS=altosui
 
@@ -40,7 +40,6 @@ altosui_JAVA = \
        AltosEepromDelete.java \
        AltosEepromDownload.java \
        AltosEepromList.java \
-       AltosEepromLog.java \
        AltosEepromManage.java \
        AltosEepromMonitor.java \
        AltosEepromTeleScience.java \
@@ -50,12 +49,10 @@ altosui_JAVA = \
        AltosIMU.java \
        AltosMag.java \
        AltosEepromSelect.java \
-       AltosFile.java \
        AltosFlash.java \
        AltosFlashUI.java \
        AltosFlightDisplay.java \
        AltosFlightInfoTableModel.java \
-       AltosFlightReader.java \
        AltosFlightStats.java \
        AltosFlightStatsTable.java \
        AltosFlightStatus.java \
@@ -63,7 +60,6 @@ altosui_JAVA = \
        AltosFlightUI.java \
        AltosFontListener.java \
        AltosFreqList.java \
-       AltosGreatCircle.java \
        AltosHexfile.java \
        Altos.java \
        AltosIdleMonitorUI.java \
@@ -76,24 +72,17 @@ altosui_JAVA = \
        AltosLanded.java \
        AltosLed.java \
        AltosLights.java \
-       AltosLog.java \
        AltosPad.java \
        AltosUIPreferences.java \
-       AltosReader.java \
-       AltosTelemetryReader.java \
-       AltosReplayReader.java \
        AltosRomconfig.java \
        AltosRomconfigUI.java \
        AltosScanUI.java \
        AltosSerial.java \
        AltosSerialInUseException.java \
-       AltosSerialMonitor.java \
        AltosSiteMap.java \
        AltosSiteMapPreload.java \
        AltosSiteMapCache.java \
        AltosSiteMapTile.java \
-       AltosState.java \
-       AltosTelemetryReader.java \
        AltosUI.java \
        AltosUIListener.java \
        AltosFrame.java \
@@ -249,11 +238,11 @@ $(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS
 
 Manifest.txt: Makefile
        echo 'Main-Class: altosui.AltosUI' > $@
-       echo "Class-Path: altoslib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
+       echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
 
 Manifest-fat.txt:
        echo 'Main-Class: altosui.AltosUI' > $@
-       echo "Class-Path: altoslib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
+       echo "Class-Path: AltosLib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
 
 altosui: Makefile
        echo "#!/bin/sh" > $@
@@ -298,9 +287,9 @@ build-altos64-dll:
 
 $(ALTOSLIB_CLASS):
        -rm -f "$@"
-       $(LN_S) altoslib/"$@" .
+       $(LN_S) ../altoslib/"$@" .
 
-$(FREETTS_CLASS):
+$(FREETTS_CLASS): ../altoslib/"$@"
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .