Merge branch 'bdale-ui' into telestatic-v4

[fw/altos] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 602226f5e6a643eeead30d84f21b78e436f160ad..70833b51e72911dedc5919825872896df06946a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=ao-tools src doc icon altoslib libaltos altosuilib altosui micropeak ao-utils altosdroid telegps map-server
+SUBDIRS=ao-tools src doc icon altoslib libaltos altosuilib altosui micropeak ao-utils altosdroid telegps map-server teststand
 
 EXTRA_DIST = ChangeLog
 
@@ -17,6 +17,7 @@ fat-install: fat
        cd altosui && $(MAKE) fat-install
        cd telegps && $(MAKE) fat-install
        cd micropeak && $(MAKE) fat-install
+       cd teststand && $(MAKE) fat-install
 endif
 
 fat:
@@ -29,19 +30,23 @@ fat:
        cd altosui && $(MAKE) fat
        cd micropeak && $(MAKE) fat
        cd telegps && $(MAKE) fat
+       cd teststand && $(MAKE) fat
 
 fat_linux = \
        altosui/Altos-Linux-$(VERSION).sh altosui/Altos-Linux-$(VERSION).tar.bz2 \
+       teststand/TestStand-Linux-$(VERSION).sh teststand/TestStand-Linux-$(VERSION).tar.bz2 \
        telegps/TeleGPS-Linux-$(VERSION).sh telegps/TeleGPS-Linux-$(VERSION).tar.bz2 \
        micropeak/MicroPeak-Linux-$(VERSION).sh micropeak/MicroPeak-Linux-$(VERSION).tar.bz2
 
 fat_mac = \
        altosui/Altos-Mac-$(VERSION).dmg \
+       teststand/TestStand-Mac-$(VERSION).dmg \
        telegps/TeleGPS-Mac-$(VERSION).dmg \
        micropeak/MicroPeak-Mac-$(VERSION).dmg
 
 fat_windows = \
        altosui/Altos-Windows-$(VERSION_DASH).exe \
+       teststand/TestStand-Windows-$(VERSION_DASH).exe \
        telegps/TeleGPS-Windows-$(VERSION_DASH).exe \
        micropeak/MicroPeak-Windows-$(VERSION_DASH).exe
 
@@ -51,21 +56,25 @@ fat_android = \
 
 fat_altos = \
        src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx \
+       src/easymega-v2.0/easymega-v2.0-$(VERSION).ihx \
        src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx \
-       src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx \
+       src/easymotor-v2/easymotor-v2-$(VERSION).ihx \
+       src/easytimer-v1/easytimer-v1-$(VERSION).ihx \
        src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx \
        src/telebt-v4.0/telebt-v4.0-$(VERSION).ihx \
-       src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx \
        src/teledongle-v3.0/teledongle-v3.0-$(VERSION).ihx \
        src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx \
        src/telegps-v2.0/telegps-v2.0-$(VERSION).ihx \
        src/telemega-v1.0/telemega-v1.0-$(VERSION).ihx \
        src/telemega-v2.0/telemega-v2.0-$(VERSION).ihx \
-       src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx \
-       src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx \
-       src/telemetrum-v1.2/telemetrum-v1.2-$(VERSION).ihx \
+       src/telemega-v3.0/telemega-v3.0-$(VERSION).ihx \
+       src/telemega-v4.0/telemega-v4.0-$(VERSION).ihx \
+       src/telemega-v5.0/telemega-v5.0-$(VERSION).ihx \
        src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx \
-       src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx
+       src/telemetrum-v3.0/telemetrum-v3.0-$(VERSION).ihx \
+       src/telelco-v2.0/telelco-v2.0-$(VERSION).ihx \
+       src/telefireeight-v1.0/telefireeight-v1.0-$(VERSION).ihx \
+       src/telefireeight-v2.0/telefireeight-v2.0-$(VERSION).ihx
 
 keithp-fat: fat
        ssh keithp.com mkdir -p public_html/altos-$(VERSION)