specify linking opts for jawt centrally

Change-Id: Idb8d97d44b16bbe41372d97c46199ec786c38218

RepositoryExternal.mk

@@ -762,6 +762,8 @@ endef
 
 endif # SYSTEM_CMIS
 
+ifeq ($(ENABLE_JAVA),YES)
+
 ifeq ($(OS)$(COM),WNTGCC)
 
 define gb_LinkTarget__use_jawt
@@ -772,17 +774,27 @@ $(call gb_LinkTarget_add_ldflags,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	-ljawt \
+	$(JAWTLIB) \
 )
 
 endef
 
 else # $(OS)$(COM) != WNTGCC
 
-gb_LinkTarget__use_jawt :=
+define gb_LinkTarget__use_jawt
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(JAWTLIB) \
+)
+
+endef
 
 endif # $(OS)$(COM) = WNTGCC
 
+else # !ENABLE_JAVA
+
+gb_LinkTarget__use_jawt :=
+
+endif # ENABLE_JAVA
 
 ifneq ($(SYSTEM_LIBATOMIC_OPS),)
 

bean/Library_officebean.mk

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

configure.ac

@@ -7074,7 +7074,7 @@ then
     AC_MSG_CHECKING([for JAWT lib])
     if test "$_os" = WINNT; then
         if test "$WITH_MINGW" = yes; then
-            # The path is presumably taken care of in gb_LinkTarget__use_jawt
+            # The path is taken care of in gb_LinkTarget__use_jawt
             # in RepositoryExternal.mk:
             JAWTLIB=-ljawt
         else