java: Add -target 1.6 to all java compiles

[fw/altos] / altosuilib / Makefile.am

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 26aee7c4de68f5b3cc396e5809e3f914d84a6859..4b22af1f8eda6fab2ed14cc710c7ce16db3cbfee 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -1,41 +1,52 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
 
 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 \
        AltosFontListener.java \
+       AltosPositionListener.java \
+       AltosUIConfigure.java \
+       AltosUIAxis.java \
+       AltosUIDataMissing.java \
+       AltosUIDataPoint.java \
+       AltosUIDataSet.java \
+       AltosUIGraph.java \
+       AltosUIGrapher.java \
        AltosUIDialog.java \
+       AltosUIEnable.java \
        AltosUIFrame.java \
        AltosUILib.java \
        AltosUIListener.java \
+       AltosUIMarker.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) .