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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index ce627ec0..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):
 
@@ -132,6 +136,10 @@ 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
@@ -153,13 +161,13 @@ $(DARWIN_ZIP): $(DARWIN_FILES)
 	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)
+$(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