X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=92f0e69066ed8d14de59fee4609f31d6dadefc95;hp=dcaf3ab0c088d77022c5c664b3da488485441606;hb=f550677df016070430ed38bfa2b2be33f1b8c40a;hpb=a94900b8862b99b4e317ea0ee3edd2a560f270c7

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index dcaf3ab0..92f0e690 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -7,6 +7,7 @@ CLASSFILES=\
 	AltosConfig.class \
 	AltosConfigUI.class \
 	AltosConvert.class \
+	AltosCRCException.class \
 	AltosCSV.class \
 	AltosCSVUI.class \
 	AltosDebug.class \
@@ -22,10 +23,12 @@ CLASSFILES=\
 	AltosGPS.class \
 	AltosGreatCircle.class \
 	AltosHexfile.class \
+	AltosLine.class \
 	AltosLog.class \
 	AltosLogfileChooser.class \
 	AltosParse.class \
 	AltosPreferences.class \
+	AltosReader.class \
 	AltosRecord.class \
 	AltosSerialMonitor.class \
 	AltosSerial.class \
@@ -72,11 +75,12 @@ LINUX_APP=altosui
 
 DARWIN_ZIP=Altos-Mac.zip
 
-WINDOWS_ZIP=Altos-Windows.zip
+WINDOWS_EXE=Altos-Windows.exe
 
 LINUX_TGZ=Altos-Linux.tgz
 
-all: altosui altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
+all: altosui.jar $(LINUX_APP)
+fat: altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_EXE) $(LINUX_TGZ)
 
 $(CLASSFILES):
 
@@ -122,9 +126,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
@@ -132,11 +136,15 @@ clean:
 	rm -rf classes
 	rm -rf windows linux
 
+distclean:	clean
+	rm -f $(DARWIN_ZIP) $(WINDOWS_EXE) $(LINUX_TGZ)
+	rm -rf darwin fat
+
 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,19 +155,19 @@ 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
 	mkdir -p darwin/AltOS
 	cp $(DARWIN_EXTRA) darwin/AltOS
-	cd darwin && zip -j -r ../$@ AltosUI.app AltOS
+	cd darwin && zip -r ../$@ AltosUI.app AltOS
 
 WINDOWS_FILES = $(FAT_FILES) ../libaltos/altos.dll ../../telemetrum.inf
 
-$(WINDOWS_ZIP): $(WINDOWS_FILES)
-	rm $@
+$(WINDOWS_EXE): $(WINDOWS_FILES) altos-windows.nsi
+	rm -f $@
 	mkdir -p windows/AltOS
 	rm -f windows/AltOS/*
 	cp $(WINDOWS_FILES) windows/AltOS
-	cd windows && zip -j -r ../$@ AltOS
+	makensis altos-windows.nsi