X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMakefile.am;h=fde981a6c6bbe975f111388684feb6725736e4a5;hb=56a1210a7b04a3623d19ec282f26fecc79c126dd;hp=32be90704415da436b824c528e5fb1740ee128c1;hpb=9da9adc2718928de2af65a68cddbcc636cc3e9e8;p=fw%2Faltos

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 32be9070..fde981a6 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,7 +1,7 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
 
 bin_SCRIPTS=micropeak
 
@@ -10,6 +10,7 @@ micropeakdir=$(datadir)/java
 micropeak_JAVA= \
 	MicroPeak.java \
 	MicroData.java \
+	MicroFrame.java \
 	MicroGraph.java \
 	MicroSerial.java \
 	MicroFileChooser.java \
@@ -33,11 +34,34 @@ LIBALTOS= \
 ALTOSLIB_CLASS=\
 	AltosLib.jar
 
+ALTOSUILIB_CLASS=\
+	AltosUILib.jar
+
+# Icons
+ICONDIR=$(top_srcdir)/icon
+
+JAVA_ICONS=\
+	$(ICONDIR)/micropeak-16.png \
+	$(ICONDIR)/micropeak-32.png \
+	$(ICONDIR)/micropeak-48.png \
+	$(ICONDIR)/micropeak-64.png \
+	$(ICONDIR)/micropeak-128.png \
+	$(ICONDIR)/micropeak-256.png
+
+# icon base names for jar
+ICONJAR= -C $(ICONDIR) micropeak-16.png \
+	-C $(ICONDIR) micropeak-32.png \
+	-C $(ICONDIR) micropeak-48.png \
+	-C $(ICONDIR) micropeak-64.png \
+	-C $(ICONDIR) micropeak-128.png \
+	-C $(ICONDIR) micropeak-256.png
+
 all-local: micropeak-test $(JAR)
 
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
 		$(ALTOSLIB_CLASS) \
+		$(ALTOSUILIB_CLASS) \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt \
 		micropeak micropeak-test macosx linux windows
 
@@ -51,13 +75,13 @@ micropeak-test: Makefile
 	echo 'exec java -cp "./*:../libaltos/*:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" -jar micropeak.jar "$$@"' >> $@
 	chmod +x $@
 
-$(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS)
+$(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)
 	jar cfm $@ Manifest.txt \
 		$(ICONJAR) \
 		-C classes org \
 		-C ../libaltos libaltosJNI
 
-$(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS)
+$(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS)
 	jar cfm $@ Manifest-fat.txt \
 		$(ICONJAR) \
 		-C classes org \
@@ -98,6 +122,10 @@ $(ALTOSLIB_CLASS):
 	-rm -f "$@"
 	$(LN_S) ../altoslib/"$@" .
 
+$(ALTOSUILIB_CLASS):
+	-rm -f "$@"
+	$(LN_S) ../altosuilib/"$@" .
+
 $(JFREECHART_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(JFREECHART)"/"$@" .
@@ -108,9 +136,9 @@ $(JCOMMON_CLASS):
 
 Manifest.txt: Makefile
 	echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
-	echo "Class-Path: AltosLib.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
+	echo "Class-Path: AltosLib.jar AltosUILib.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
 
 Manifest-fat.txt:
 	echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
-	echo "Class-Path: AltosLib.jar jcommon.jar jfreechart.jar" >> $@
+	echo "Class-Path: AltosLib.jar AltosUILib.jar jcommon.jar jfreechart.jar" >> $@