X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FMakefile.am;h=41f0d6ad4085de9ecc283b5cdd1cd19f27a9a3e4;hb=140a84ba8ac1e6548ab63ff586cf214d87f727a4;hp=424b6dbdc1096e43bbb9e34a6720101da86e58cd;hpb=edef072dd5cffdbd3e8346719a81808b17bdc570;p=fw%2Faltos diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 424b6dbd..41f0d6ad 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -1,3 +1,4 @@ +# location of code signing key, et al JAVAROOT=classes AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked @@ -170,6 +171,7 @@ FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FI ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf ALTOS_DOC=$(top_srcdir)/doc/altos.pdf TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf +MOTORTEST_DOC=$(top_srcdir)/doc/motortest.pdf TEMPLATE_DOC=\ $(top_srcdir)/doc/telemetrum-outline.pdf \ $(top_srcdir)/doc/easymini-outline.pdf \ @@ -177,7 +179,7 @@ TEMPLATE_DOC=\ $(top_srcdir)/doc/telemini-v1-outline.pdf \ $(top_srcdir)/doc/telemini-v3-outline.pdf -DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC) +DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(MOTORTEST_DOC) $(TEMPLATE_DOC) # Distribution targets LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2 @@ -410,3 +412,8 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi Instdrv/NSIS/Includes/java.nsh -rm -f $@ makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi || (cat altos-windows.log && exit 1) + if [ "$(HAVE_WINDOWS_KEY)" = "yes" ]; then \ + jsign --keystore "$(WINDOWSKEYFILE)" --alias 1 \ + --storetype PKCS12 --storepass `cat "$(WINDOWSKEYPASSFILE)"` \ + --tsaurl http://ts.ssl.com --tsmode RFC3161 $@ ; \ + fi