Use explicit build deps for altosui (avoids * wildcarding)

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 19db66980cb8f2f8a94665e0133936325c1882c0..aca2e8fceef936967e045004a31d412ee2f652d9 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -6,7 +6,9 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
+# tmarble: attempt to use specific build deps
+# CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:/usr/share/java/jcommon.jar:/usr/share/java/jfreechart.jar:/usr/share/java/freetts.jar"
 
 bin_SCRIPTS=altosui
 
@@ -112,9 +114,9 @@ LIBALTOS= \
        libaltos.dylib \
        altos.dll
 
-JAR=altosui.jar
+JAR=AltosUI.jar
 
-FATJAR=altosui-fat.jar
+FATJAR=AltosUI-fat.jar
 
 # Icons
 ICONDIR=$(top_srcdir)/icon
@@ -170,7 +172,7 @@ MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
-all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
+all-local: classes/AltosUI $(JAR) altosui altosui-test altosui-jdb
 
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
@@ -207,43 +209,43 @@ endif
 
 altosuidir=$(datadir)/java
 
-install-altosuiJAVA: altosui.jar
+install-altosuiJAVA: AltosUI.jar
        @$(NORMAL_INSTALL)
        test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
-       echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/altosui.jar'"; \
+       echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/AltosUI.jar'"; \
        $(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
 
-classes/altosui:
-       mkdir -p classes/altosui
+classes/AltosUI:
+       mkdir -p classes/AltosUI
 
 $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
        jar cfm $@ Manifest.txt \
                $(ICONJAR) \
-               -C classes altosui \
+               -C classes AltosUI \
                -C libaltos libaltosJNI
 
 $(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
        jar cfm $@ Manifest-fat.txt \
                $(ICONJAR) \
-               -C classes altosui \
+               -C classes AltosUI \
                -C libaltos libaltosJNI
 
 Manifest.txt: Makefile
-       echo 'Main-Class: altosui.AltosUI' > $@
+       echo 'Main-Class: AltosUI.AltosUI' > $@
        echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
 
 Manifest-fat.txt:
-       echo 'Main-Class: altosui.AltosUI' > $@
+       echo 'Main-Class: AltosUI.AltosUI' > $@
        echo "Class-Path: AltosLib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
 
 altosui: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java  -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+       echo 'exec java  -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/AltosUI.jar" "$$@"' >> $@
        chmod +x $@
 
 altosui-test: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java -cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+       echo 'exec java -cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar AltosUI.jar "$$@"' >> $@
        chmod +x $@
 
 altosui-jdb: Makefile