don't build all the "fat" jar deliverables by default

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 6514c608f500c79eaf056922e7a789402d9b9a59..5a8d7454a1db9a202907a1a623503a6513049459 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -76,7 +76,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 +89,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 +123,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 +137,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 +148,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 +159,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