X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=56ac0520e2240020f9f24adcdfff3a1df0a8e0da;hp=760e662de26c996cb576c8c7ee16d3fd8744e3eb;hb=fd010661ced6075f82a961625826665a3d8d1efe;hpb=6c0ae7e966a81ece35bccbe89d626a58afe899a2

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 760e662d..56ac0520 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,6 +1,10 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8
 
+man_MANS=altosui.1
+
+altoslibdir=$(libdir)/altos
+
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 bin_SCRIPTS=altosui
@@ -29,6 +33,7 @@ altosui_JAVA = \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosInfoTable.java \
 	AltosLine.java \
 	AltosLogfileChooser.java \
 	AltosLog.java \
@@ -41,6 +46,7 @@ altosui_JAVA = \
 	AltosSerial.java \
 	AltosSerialMonitor.java \
 	AltosState.java \
+	AltosStatusTable.java \
 	AltosTelemetry.java \
 	AltosTelemetryReader.java \
 	AltosUI.java \
@@ -96,7 +102,32 @@ clean-local:
 		$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
 		altosui altosui-test macosx linux
 
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+if FATINSTALL
+
+FATTARGET=$(FATDIR)/$(VERSION)
+
+LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
+WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
+
+fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+
+$(LINUX_DIST_TARGET): $(LINUX_DIST)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
+$(MACOSX_DIST_TARGET): $(MACOSX_DIST)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
+$(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+endif
+
 
 altosuidir=$(datadir)/java
 
@@ -131,15 +162,23 @@ Manifest-fat.txt:
 
 altosui: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+	echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
 	chmod +x $@
 
 altosui-test: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar "$$*"' >> $@
+	echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
 	chmod +x $@
 
-$(LIBALTOS):
+libaltos.so:
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos.dylib:
+	-rm -f "$@"
+	$(LN_S) ../libaltos/"$@" .
+
+altos.dll:
 	-rm -f "$@"
 	$(LN_S) ../libaltos/"$@" .
 
@@ -169,4 +208,4 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
 	-rm -f $@
-	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
\ No newline at end of file
+	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi