projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos]
/
ao-tools
/
altosui
/
Makefile.am
diff --git
a/ao-tools/altosui/Makefile.am
b/ao-tools/altosui/Makefile.am
index 0a91f939db0a51fe6f4828c5dfa23473e069ab98..ab8ca7d4a80163b4ed385a64ac65c12702a136b8 100644
(file)
--- a/
ao-tools/altosui/Makefile.am
+++ b/
ao-tools/altosui/Makefile.am
@@
-20,9
+20,10
@@
altosui_JAVA = \
AltosDebug.java \
AltosDeviceDialog.java \
AltosDevice.java \
AltosDebug.java \
AltosDeviceDialog.java \
AltosDevice.java \
+ AltosDisplayThread.java \
AltosEepromDownload.java \
AltosEepromMonitor.java \
AltosEepromDownload.java \
AltosEepromMonitor.java \
- AltosEeprom
Reader
.java \
+ AltosEeprom
Iterable
.java \
AltosEepromRecord.java \
AltosFile.java \
AltosFlash.java \
AltosEepromRecord.java \
AltosFile.java \
AltosFlash.java \
@@
-33,6
+34,7
@@
altosui_JAVA = \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
+ AltosInfoTable.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
@@
-40,13
+42,16
@@
altosui_JAVA = \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
+ AltosRecordIterable.java \
+ AltosReplayThread.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSerial.java \
AltosSerialMonitor.java \
AltosState.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSerial.java \
AltosSerialMonitor.java \
AltosState.java \
+ AltosStatusTable.java \
AltosTelemetry.java \
AltosTelemetry.java \
- AltosTelemetry
Reader
.java \
+ AltosTelemetry
Iterable
.java \
AltosUI.java \
AltosCsvReader.java \
AltosDataPoint.java \
AltosUI.java \
AltosCsvReader.java \
AltosDataPoint.java \
@@
-111,8
+116,6
@@
clean-local:
$(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
$(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
-
if FATINSTALL
FATTARGET=$(FATDIR)/$(VERSION)
if FATINSTALL
FATTARGET=$(FATDIR)/$(VERSION)
@@
-135,8
+138,11
@@
$(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
mkdir -p $(FATTARGET)
cp -p $< $@
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
endif
endif
+
altosuidir=$(datadir)/java
install-altosuiJAVA: altosui.jar
altosuidir=$(datadir)/java
install-altosuiJAVA: altosui.jar