X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=bf92b5d6e50f514d37a17d6d585ba8378f30dc86;hp=6514c608f500c79eaf056922e7a789402d9b9a59;hb=775acb89660cdee2f3c54c38297baefe39f2414c;hpb=38ac388baf8125c0644b868a7aaf8eba1bdf990d

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 6514c608..bf92b5d6 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -26,6 +26,7 @@ CLASSFILES=\
 	AltosLogfileChooser.class \
 	AltosParse.class \
 	AltosPreferences.class \
+	AltosReader.class \
 	AltosRecord.class \
 	AltosSerialMonitor.class \
 	AltosSerial.class \
@@ -76,7 +77,8 @@ WINDOWS_ZIP=Altos-Windows.zip
 
 LINUX_TGZ=Altos-Linux.tgz
 
-all: $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
+all: altosui.jar $(LINUX_APP)
+fat: altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
 
 $(CLASSFILES):
 
@@ -88,7 +90,7 @@ altosui.jar: classes/altosui classes/libaltosJNI $(CLASSFILES) Manifest.txt
 
 Manifest.txt: Makefile $(CLASSFILES)
 	echo 'Main-Class: altosui.AltosUI' > $@
-	echo "Class-Path: $(FREETTSLIB)/freetts.jar' >> $@
+	echo "Class-Path: $(FREETTSLIB)/freetts.jar" >> $@
 
 classes/altosui:
 	mkdir -p classes
@@ -122,9 +124,9 @@ fat/classes/Manifest.txt: $(CLASSFILES) Makefile
 	echo "Class-Path: freetts.jar" >> $@
 
 install: altosui.jar altosui
-	/usr/bin/install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar
-	/usr/bin/install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1
-	/usr/bin/install altosui $(DESTDIR)/usr/bin/altosui
+	install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar
+	install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1
+	install altosui $(DESTDIR)/usr/bin/altosui
 
 clean:
 	rm -f *.class altosui.jar
@@ -136,7 +138,7 @@ FAT_FILES=$(FATJAR) $(FREETTSJAR) $(HEXFILES)
 
 LINUX_FILES=$(FAT_FILES) ../libaltos/libaltos.so fat/altosui
 $(LINUX_TGZ): $(LINUX_FILES)
-	rm $@
+	rm -f $@
 	mkdir -p linux/AltOS
 	rm -f linux/AltOS/*
 	cp $(LINUX_FILES) linux/AltOS
@@ -147,7 +149,7 @@ DARWIN_EXTRA=$(HEXFILES)
 DARWIN_FILES=$(DARWIN_RESOURCES) $(DARWIN_EXTRA)
 
 $(DARWIN_ZIP): $(DARWIN_FILES)
-	rm $@
+	rm -f $@
 	cp -a AltosUI.app darwin/
 	mkdir -p darwin/AltosUI.app/Contents/Resources/Java
 	cp $(DARWIN_RESOURCES) darwin/AltosUI.app/Contents/Resources/Java
@@ -158,7 +160,7 @@ $(DARWIN_ZIP): $(DARWIN_FILES)
 WINDOWS_FILES = $(FAT_FILES) ../libaltos/altos.dll ../../telemetrum.inf
 
 $(WINDOWS_ZIP): $(WINDOWS_FILES)
-	rm $@
+	rm -f $@
 	mkdir -p windows/AltOS
 	rm -f windows/AltOS/*
 	cp $(WINDOWS_FILES) windows/AltOS