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..35a1b99035665f21d3de454270a89cb5f8f7ebd1 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -33,6 +33,7 @@ altosui_JAVA = \
        AltosGreatCircle.java \
        AltosHexfile.java \
        Altos.java \
+       AltosInfoTable.java \
        AltosLine.java \
        AltosLogfileChooser.java \
        AltosLog.java \
@@ -45,6 +46,7 @@ altosui_JAVA = \
        AltosSerial.java \
        AltosSerialMonitor.java \
        AltosState.java \
+       AltosStatusTable.java \
        AltosTelemetry.java \
        AltosTelemetryReader.java \
        AltosUI.java \
@@ -111,8 +113,6 @@ clean-local:
                $(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)
@@ -135,8 +135,11 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
        mkdir -p $(FATTARGET)
        cp -p $< $@
 
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
+
 altosuidir=$(datadir)/java
 
 install-altosuiJAVA: altosui.jar