X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=eec15786cc3d57d405f9352e509783a1179da319;hp=cddc78d3efdb6f04e48263673b296edae5e90782;hb=630f457666b48321be0a5b6fbf391efef1fa3eb4;hpb=56629222711ba3ef7853405c9b07ad614fb29b95 diff --git a/altosui/Makefile.am b/altosui/Makefile.am index cddc78d3..eec15786 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -140,7 +140,8 @@ FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0) FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx -FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0) +FIRMWARE_EMEGA_2_0=$(top_srcdir)/src/easymega-v2.0/easymega-v2.0-$(VERSION).ihx +FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0) $(FIRMWARE_EMEGA_2_0) FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx FIRMWARE_TGPS_2_0=$(top_srcdir)/src/telegps-v2.0/telegps-v2.0-$(VERSION).ihx @@ -254,12 +255,18 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTOSU $(ICONJAR) \ -C classes altosui \ -C ../libaltos libaltosJNI +if STRIP_NONDETERMINISM + $(STRIP_NONDETERMINISM) $@ +endif $(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS) jar cfm $@ Manifest-fat.txt \ $(ICONJAR) \ -C classes altosui \ -C ../libaltos libaltosJNI +if STRIP_NONDETERMINISM + $(STRIP_NONDETERMINISM) $@ +endif Manifest.txt: Makefile echo 'Main-Class: altosui.AltosUI' > $@