altosui: Fix linux fat distribution

[fw/altos] / ao-tools / altosui / Makefile.am

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index ed7e2f762292e87c9e89c539dd21c768f379cf28..bc8dbc0dd0c5de4773f488ef5650286ca49b76b9 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,4 +1,5 @@
 JAVAROOT=classes
+AM_JAVACFLAGS=-encoding UTF-8
 
 CLASSPATH_ENV=CLASSPATH="classes/altosui/*:../libaltos/libaltosJNI/*:$(FREETTS)/*:/usr/share/java/*"
 
@@ -78,13 +79,14 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
 
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_EXTRA=altosui-fat
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
-all-local: classes/altosui $(JAR) $(FATJAR)
+all-local: classes/altosui $(JAR) $(FATJAR) altosui altosui-test
 
 clean-local:
        -rm -rf classes/altosui $(JAR) $(FATJAR) \
@@ -139,15 +141,17 @@ $(LIBALTOS):
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
 
-$(FREETTS_CLASS): Makefile
+$(FREETTS_CLASS):
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .
 
-$(LINUX_DIST): $(LINUX_FILES)
+$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
        -rm -f $@
        -rm -rf linux
        mkdir -p linux/AltOS
-       cp -a $(LINUX_FILES) linux/AltOS
+       cp -p $(LINUX_FILES) linux/AltOS
+       cp -p altosui-fat linux/AltOS/altosui
+       chmod +x linux/AltOS/altosui
        tar cjf $@ -C linux AltOS
 
 $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
@@ -156,8 +160,9 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
        mkdir macosx
        cp -a AltosUI.app macosx/
        mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
-       cp -a $(MACOSX_FILES) macosx/AltosUI.app/Contents/Resources/Java
-       cp -a $(MACOSX_EXTRA) macosx/AltOS
+       cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
+       cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+       cp -p $(MACOSX_EXTRA) macosx/AltOS
        cd macosx && zip -r ../$@ AltosUI.app AltOS
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi