diff options
| -rw-r--r-- | RepositoryExternal.mk | 16 | ||||
| -rw-r--r-- | bean/Library_officebean.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ccd2f5bc1160..e9031c665ce9 100644 --- a/RepositoryExternal.mk +++ b/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),) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 3a66ed2a99ee..f05fa30dce81 100644 --- a/bean/Library_officebean.mk +++ b/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: diff --git a/configure.ac b/configure.ac index d377325a20d6..0f743b9bbee7 100644 --- a/configure.ac +++ b/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 |