altoslib: Clean up random rebase failures

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index a168b6fc7d356136e8c1e4b8d8c16cc6e70367db..9fc7b5b3aaa0b50dccf5e61890f59cb83aaa14da 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
 
@@ -27,8 +27,6 @@ altosui_JAVA = \
        AltosConfigureUI.java \
        AltosConfigTD.java \
        AltosConfigTDUI.java \
-       AltosConvert.java \
-       AltosCRCException.java \
        AltosCSV.java \
        AltosCSVUI.java \
        AltosDebug.java \
@@ -40,22 +38,15 @@ altosui_JAVA = \
        AltosEepromDelete.java \
        AltosEepromDownload.java \
        AltosEepromList.java \
-       AltosEepromLog.java \
        AltosEepromManage.java \
        AltosEepromMonitor.java \
-       AltosEepromTeleScience.java \
        AltosEepromMega.java \
        AltosEepromMegaIterable.java \
-       AltosMs5607.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 +54,6 @@ altosui_JAVA = \
        AltosFlightUI.java \
        AltosFontListener.java \
        AltosFreqList.java \
-       AltosGreatCircle.java \
        AltosHexfile.java \
        Altos.java \
        AltosIdleMonitorUI.java \
@@ -76,24 +66,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 +232,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" > $@
@@ -270,7 +253,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/"$@" .
 
@@ -286,10 +269,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
 
@@ -298,7 +285,7 @@ build-altos64-dll:
 
 $(ALTOSLIB_CLASS):
        -rm -f "$@"
-       $(LN_S) altoslib/"$@" .
+       $(LN_S) ../altoslib/"$@" .
 
 $(FREETTS_CLASS):
        -rm -f "$@"