diff options
| author | Keith Packard <keithp@keithp.com> | 2012-01-04 20:28:42 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-04 20:28:48 -0800 |
| commit | 61e24559a6ff23c605997fac24afa3d2e8e9667c (patch) | |
| tree | 9847a1bfc0680a4e15ea0c1bdec4b35cd9109bac | |
| parent | 2fa4e66c0c9220c3b9c1f8ffec9cee710b709173 (diff) | |
altosui: Move java altoslib to top level
This will be shared with other (android) java code.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | altoslib/.gitignore (renamed from altosui/altoslib/.gitignore) | 0 | ||||
| -rw-r--r-- | altoslib/Makefile.am (renamed from altosui/altoslib/Makefile.am) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosFile.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFile.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosLib.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLib.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosLine.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosLink.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosLog.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLog.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosParse.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosState.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosState.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java) | 0 | ||||
| -rw-r--r-- | altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java (renamed from altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java) | 0 | ||||
| -rw-r--r-- | altosui/Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 2 |
43 files changed, 6 insertions, 6 deletions
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 index ad2f8cbf..ad2f8cbf 100644 --- a/altosui/altoslib/.gitignore +++ b/altoslib/.gitignore diff --git a/altosui/altoslib/Makefile.am b/altoslib/Makefile.am index 2ddd24e6..2ddd24e6 100644 --- a/altosui/altoslib/Makefile.am +++ b/altoslib/Makefile.am diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java b/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java index 101c5363..101c5363 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java +++ b/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 index 55ade0a0..55ade0a0 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java +++ b/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 index d2aa629c..d2aa629c 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java +++ b/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 index 0568c462..0568c462 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java +++ b/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 index 4e5c0b7b..4e5c0b7b 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromIterable.java +++ b/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 index 83b776b7..83b776b7 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromLog.java +++ b/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 index 1e845f46..1e845f46 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromRecord.java +++ b/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 index 1758fa34..1758fa34 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java +++ b/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 index d2e4f2f7..d2e4f2f7 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFile.java +++ b/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 index 04bd79a7..04bd79a7 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFlightReader.java +++ b/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 index 57cb9c48..57cb9c48 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java +++ b/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 index f078a469..f078a469 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java +++ b/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 index faa1ec8d..faa1ec8d 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java +++ b/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 index 76b71859..76b71859 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGreatCircle.java +++ b/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 index 2921d040..2921d040 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLib.java +++ b/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 index 5627795a..5627795a 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java +++ b/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 index 9b80e916..9b80e916 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java +++ b/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 index 08c45ca8..08c45ca8 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLog.java +++ b/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 index 7d832f1a..7d832f1a 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java +++ b/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 index 43c7088d..43c7088d 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosPreferences.java +++ b/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 index 08d87410..08d87410 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java +++ b/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 index c8cc6cac..c8cc6cac 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java +++ b/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 index ed1787ed..ed1787ed 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java +++ b/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 index 1585f9eb..1585f9eb 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosReplayReader.java +++ b/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 index 893e19a9..893e19a9 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosState.java +++ b/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 index beac072e..beac072e 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java +++ b/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 index 73026bf7..73026bf7 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java +++ b/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 index 003cb6a9..003cb6a9 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java +++ b/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 index ae4dd554..ae4dd554 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java +++ b/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 index 017d5be9..017d5be9 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java +++ b/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 index 6ad17244..6ad17244 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java +++ b/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 index 25242edc..25242edc 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java +++ b/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 index 5e157a54..5e157a54 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java +++ b/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 index 2dac5ca4..2dac5ca4 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java +++ b/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 index cddb773d..cddb773d 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java +++ b/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 index 4c0c4972..4c0c4972 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java +++ b/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 index 2526afb6..2526afb6 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java +++ b/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 index cfaf90b0..cfaf90b0 100644 --- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java +++ b/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java diff --git a/altosui/Makefile.am b/altosui/Makefile.am index a5003635..10d9bd87 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 @@ -276,9 +276,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 6446f651..3f9377ee 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 |