Merge AWTLIB and JAVALIB together as JAWTLIB

...only used in bean/Library_officebean.mk

Change-Id: Ic57eb66197f55562157c2ca961001ed01e9906b2

README.cross

@@ -431,7 +431,6 @@ PYTHON_CFLAGS=-I<path-to-raspbian_rootfs>/usr/include/python2.7
 PYTHON_LIBS=-lpython2.7
 --with-java
 JAVAINC=-I<path-to-raspbian_rootfs>/usr/lib/jvm/java-6-openjdk-armhf/include
-JAVALIB=-L<path-to-raspbian_rootfs>/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
 --with-system-cairo
 --with-system-cppunit
 --with-system-icu

bean/Library_officebean.mk

@@ -34,8 +34,7 @@ $(eval $(call gb_Library_use_libraries,officebean,\
 ))
 
 $(eval $(call gb_Library_add_libs,officebean,\
-	$(JAVALIB) \
-	$(AWTLIB) \
+	$(JAWTLIB) \
 ))
 
 # vim: set noet sw=4 ts=4:

config_host.mk.in

@@ -31,7 +31,6 @@ export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
 export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
 export LIBATOMIC_OPS_CFLAGS=$(gb_SPACE)@LIBATOMIC_OPS_CFLAGS@
 export LIBATOMIC_OPS_LIBS=$(gb_SPACE)@LIBATOMIC_OPS_LIBS@
-export AWTLIB=@AWTLIB@
 export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
 export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
 export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
@@ -282,10 +281,10 @@ export JAVADOCISGJDOC=@JAVADOCISGJDOC@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
-@x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
 export JAVA_TARGET_VER=@JAVA_TARGET_VER@
+export JAWTLIB=@JAWTLIB@
 export JDK=@JDK@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
 export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@