X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FMakefile.am;h=e338b7cd03d344311e54402ecb4d209d5747c19d;hp=e2ff8cb5df679d4dc215eeec9ac140221554dfeb;hb=9839b0b62d797a8616fc66038e3f3c68e2a214d0;hpb=d83587c3c66b730cc54ca153714eee520ee40b2c

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index e2ff8cb5..e338b7cd 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -2,43 +2,47 @@ AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
 JAVAROOT=bin
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:../altoslib/*:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../libaltos:/usr/share/java/*"
 
 SRC=.
-BIN=bin/org/altusmetrum/AltosUILib
 
-AltosUILibdir = $(datadir)/java
+altosuilibdir = $(datadir)/java
 
-AltosUILib_JAVA = \
-	AltosConfigureUI.java \
+altosuilib_JAVA = \
 	AltosDevice.java \
 	AltosDeviceDialog.java \
-	AltosUSBDevice.java \
 	AltosFontListener.java \
+	AltosPositionListener.java \
+	AltosUIConfigure.java \
+	AltosUIDataPoint.java \
+	AltosUIDataSet.java \
+	AltosUIGraph.java \
 	AltosUIDialog.java \
+	AltosUIEnable.java \
 	AltosUIFrame.java \
 	AltosUILib.java \
 	AltosUIListener.java \
 	AltosUIPreferencesBackend.java \
 	AltosUIPreferences.java \
+	AltosUISeries.java \
 	AltosUIVersion.java \
-	AltosUnitsListener.java
+	AltosUSBDevice.java
 
-JAR=AltosUILib.jar
+JAR=altosuilib_$(ALTOSUILIB_VERSION).jar
 
 all-local: $(JAR)
 
 clean-local:
-	-rm -rf bin $(JAR)
+	-rm -rf $(JAVAROOT) $(JAR)
 
-install-AltosUILibJAVA: $(JAR)
+install-altosuilibJAVA: $(JAR)
 	@$(NORMAL_INSTALL)
-	test -z "$(AltosUILibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosUILibdir)"
-	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosUILibdir)/$(JAR)"; \
-	$(INSTALL_DATA) "$<" "$(DESTDIR)$(AltosUILibdir)"
+	test -z "$(altosuilibdir)" || $(MKDIR_P) "$(DESTDIR)$(altosuilibdir)"
+	echo " $(INSTALL_DATA)" "$(JAR)" "'$(DESTDIR)$(altosuilibdir)/$(JAR)"; \
+	$(INSTALL_DATA) "$(JAR)" "$(DESTDIR)$(altosuilibdir)"
 
-bin:
-	mkdir -p bin
+$(JAVAROOT):
+	mkdir -p $(JAVAROOT)
 
-$(JAR): classAltosUILib.stamp
-	jar cf $@ -C bin org
+$(JAR): classaltosuilib.stamp
+	jar cf $@ -C $(JAVAROOT) .