diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
| commit | f766a457323268857b3f2dfc7f42427437b71cb7 (patch) | |
| tree | 8afc8a661d682fc34b16fc0b1b44f2844d34f336 /Makefile.am | |
| parent | db51224af01731e7323f6f696a7397d64eb80b92 (diff) | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
Merge branch 'branch-1.6' into debian
Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2f8a5ee1..1af40358 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ dist-hook: ChangeLog fat: cd src && $(MAKE) all cd doc && $(MAKE) all - cd libaltos && $(MAKE) all + cd libaltos && $(MAKE) fat cd altoslib && $(MAKE) all cd altosuilib && $(MAKE) all cd icon && $(MAKE) fat @@ -23,5 +23,23 @@ fat: cd micropeak && $(MAKE) fat cd telegps && $(MAKE) fat +fat_linux = \ + altosui/Altos-Linux-$(VERSION).sh altosui/Altos-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 \ + telegps/TeleGPS-Mac-$(VERSION).dmg \ + micropeak/MicroPeak-Mac-$(VERSION).dmg + +fat_windows = \ + altosui/Altos-Windows-$(VERSION_DASH).exe \ + telegps/TeleGPS-Windows-$(VERSION_DASH).exe \ + micropeak/MicroPeak-Windows-$(VERSION_DASH).exe + +keithp-fat: fat + scp -p $(fat_linux) $(fat_mac) $(fat_windows) keithp.com:public_html/altos-$(VERSION) + set-java-versions: $(top_srcdir)/fix-java-versions org.altusmetrum.altoslib=$(ALTOSLIB_VERSION) org.altusmetrum.altosuilib=$(ALTOSUILIB_VERSION) |