Support for --with-java-target-version in gbuild

...had been missing.  Old dmake-based build system did not add -source/-target
when using gcj (unless gcj really was Eclipse Java Compiler, in which case those
-source/-target values were tunneled in via JAVAFLAGS)---hopefully all this is
no longer necessary.

(Also removed a single use of JAVA_TARGET_FLAG that was nowhere defined.)

Change-Id: Ic3596691b622be45e151333981f8f236d11825b4

config_host.mk.in

@@ -238,7 +238,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BIPMAP=@INTRO_BITMAP@
-export JAVAFLAGS=@JAVAFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 export JAVACISGCJ=@JAVACISGCJ@

configure.in

@@ -1623,8 +1623,8 @@ AC_ARG_WITH(java,
 AC_ARG_WITH(java_target_version,
     AS_HELP_STRING([--with-java-target-version],
         [Generate class files that will work on JVMs with the specified version.
-         For example, use --with-java-target-version=1.4 to make sure that the
-         application will work with JVM 1.4 even when compiled with JDK 1.5.])
+         For example, use --with-java-target-version=1.5 to make sure that the
+         application will work with JVM 1.5 even when compiled with JDK 1.6.])
     [
                           This option is ignored when you compile with gcj/gij.
 
@@ -5336,8 +5336,6 @@ if test "$SOLAR_JAVA" != ""; then
         AC_MSG_CHECKING([re-checking JDK])
         JDK=gcj
         AC_MSG_RESULT([checked (ecj)])
-        #TODO: what's to do here? some switch to do 1.5 compiling?
-        JAVAFLAGS="-source 1.5 -target 1.5"
         _gij_longver="40200"
     fi
 fi
@@ -5823,7 +5821,6 @@ AC_SUBST(CLASSPATH)
 AC_SUBST(JAVALIB)
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
-AC_SUBST(JAVAFLAGS)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
 AC_SUBST(JAVA_HOME)

solenv/gbuild/JavaClassSet.mk

@@ -26,7 +26,8 @@
 #
 #*************************************************************************
 
-gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
+gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) \
+    -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
 gb_JavaClassSet_JAVACDEBUG :=
 
 # Enforces correct dependency order for possibly generated stuff:

solenv/inc/settings.mk

@@ -133,8 +133,6 @@ JAVARESPONSE=
 .ENDIF
 .ENDIF
 
-JAVAFLAGS+=$(JAVA_TARGET_FLAG)
-
 #END JAVA
 
 CDEFS=