From 81465a20049da40cd8d3cda920d6585ffe87bfe3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 4 Jan 2012 20:28:42 -0800
Subject: [PATCH] altosui: Move java altoslib to top level

This will be shared with other (android) java code.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 Makefile.am                                               | 2 +-
 {altosui/altoslib => altoslib}/.gitignore                 | 0
 {altosui/altoslib => altoslib}/Makefile.am                | 0
 .../src/org/altusmetrum/AltosLib/AltosCRCException.java   | 0
 .../src/org/altusmetrum/AltosLib/AltosConfigData.java     | 0
 .../src/org/altusmetrum/AltosLib/AltosConvert.java        | 0
 .../src/org/altusmetrum/AltosLib/AltosEepromChunk.java    | 0
 .../src/org/altusmetrum/AltosLib/AltosEepromIterable.java | 0
 .../src/org/altusmetrum/AltosLib/AltosEepromLog.java      | 0
 .../src/org/altusmetrum/AltosLib/AltosEepromRecord.java   | 0
 .../org/altusmetrum/AltosLib/AltosEepromTeleScience.java  | 0
 .../src/org/altusmetrum/AltosLib/AltosFile.java           | 0
 .../src/org/altusmetrum/AltosLib/AltosFlightReader.java   | 0
 .../src/org/altusmetrum/AltosLib/AltosFrequency.java      | 0
 .../src/org/altusmetrum/AltosLib/AltosGPS.java            | 0
 .../src/org/altusmetrum/AltosLib/AltosGPSSat.java         | 0
 .../src/org/altusmetrum/AltosLib/AltosGreatCircle.java    | 0
 .../src/org/altusmetrum/AltosLib/AltosLib.java            | 0
 .../src/org/altusmetrum/AltosLib/AltosLine.java           | 0
 .../src/org/altusmetrum/AltosLib/AltosLink.java           | 0
 .../src/org/altusmetrum/AltosLib/AltosLog.java            | 0
 .../src/org/altusmetrum/AltosLib/AltosParse.java          | 0
 .../src/org/altusmetrum/AltosLib/AltosPreferences.java    | 0
 .../src/org/altusmetrum/AltosLib/AltosRecord.java         | 0
 .../org/altusmetrum/AltosLib/AltosRecordCompanion.java    | 0
 .../src/org/altusmetrum/AltosLib/AltosRecordIterable.java | 0
 .../src/org/altusmetrum/AltosLib/AltosReplayReader.java   | 0
 .../src/org/altusmetrum/AltosLib/AltosState.java          | 0
 .../src/org/altusmetrum/AltosLib/AltosTelemetry.java      | 0
 .../org/altusmetrum/AltosLib/AltosTelemetryIterable.java  | 0
 .../src/org/altusmetrum/AltosLib/AltosTelemetryMap.java   | 0
 .../org/altusmetrum/AltosLib/AltosTelemetryReader.java    | 0
 .../org/altusmetrum/AltosLib/AltosTelemetryRecord.java    | 0
 .../AltosLib/AltosTelemetryRecordCompanion.java           | 0
 .../AltosLib/AltosTelemetryRecordConfiguration.java       | 0
 .../altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java | 0
 .../altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java  | 0
 .../AltosLib/AltosTelemetryRecordLocation.java            | 0
 .../org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java | 0
 .../AltosLib/AltosTelemetryRecordSatellite.java           | 0
 .../altusmetrum/AltosLib/AltosTelemetryRecordSensor.java  | 0
 altosui/Makefile.am                                       | 8 ++++----
 configure.ac                                              | 2 +-
 43 files changed, 6 insertions(+), 6 deletions(-)
 rename {altosui/altoslib => altoslib}/.gitignore (100%)
 rename {altosui/altoslib => altoslib}/Makefile.am (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosCRCException.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosConfigData.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosConvert.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosEepromChunk.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosEepromIterable.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosEepromLog.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosEepromRecord.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosFile.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosFlightReader.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosFrequency.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosGPS.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosGPSSat.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosGreatCircle.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosLib.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosLine.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosLink.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosLog.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosParse.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosPreferences.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosRecord.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosRecordIterable.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosReplayReader.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosState.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetry.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java (100%)
 rename {altosui/altoslib => altoslib}/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java (100%)

diff --git a/Makefile.am b/Makefile.am
index e1ee30a3..18845551 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=src doc altosui ao-tools ao-utils
+SUBDIRS=src doc altoslib altosui ao-tools ao-utils
 
 EXTRA_DIST = ChangeLog
 
diff --git a/altosui/altoslib/.gitignore b/altoslib/.gitignore
similarity index 100%
rename from altosui/altoslib/.gitignore
rename to altoslib/.gitignore
diff --git a/altosui/altoslib/Makefile.am b/altoslib/Makefile.am
similarity index 100%
rename from altosui/altoslib/Makefile.am
rename to altoslib/Makefile.am
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java b/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java b/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java b/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java b/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java b/altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java b/altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java b/altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java b/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFile.java b/altoslib/src/org/altusmetrum/AltosLib/AltosFile.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFile.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosFile.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java b/altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java b/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java b/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java b/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java b/altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLib.java b/altoslib/src/org/altusmetrum/AltosLib/AltosLib.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLib.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosLib.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java b/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosLine.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java b/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosLink.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLog.java b/altoslib/src/org/altusmetrum/AltosLib/AltosLog.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLog.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosLog.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java b/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosParse.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java b/altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java b/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java b/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java b/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java b/altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosState.java b/altoslib/src/org/altusmetrum/AltosLib/AltosState.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosState.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosState.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java
similarity index 100%
rename from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java
rename to altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 7a3c53e7..d494547b 100644
--- 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
 
@@ -287,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)"/"$@" .
 
diff --git a/configure.ac b/configure.ac
index efccf714..fb078e80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,9 +111,9 @@ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 
 AC_OUTPUT([
 Makefile
+altoslib/Makefile
 altosui/Makefile
 altosui/AltosVersion.java
-altosui/altoslib/Makefile
 altosui/libaltos/Makefile
 ao-tools/Makefile
 ao-tools/lib/Makefile
-- 
2.30.2