and a few more distclean fixes

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index dcaf3ab0c088d77022c5c664b3da488485441606..abf5704f0b94c0090772e589c27e149dbd906f46 100644 (file)
--- 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: altosui altosui.jar $(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):
 
@@ -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
@@ -132,11 +134,15 @@ clean:
        rm -rf classes
        rm -rf windows linux
 
+distclean:     clean
+       rm -f $(DARWIN_ZIP) $(WINDOWS_ZIP) $(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,7 +153,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 +164,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