mingw: fix use of jawt

Change-Id: I47b4a1f5ca5b8ce3cde11d4db599d6afb54a2886

RepositoryExternal.mk

@@ -765,8 +765,14 @@ endif # SYSTEM_CMIS
 ifeq ($(OS)$(COM),WNTGCC)
 
 define gb_LinkTarget__use_jawt
-$(call gb_LinkTarget_use_packages,$(1),\
-	jawt \
+$(call gb_LinkTarget_use_custom_headers,$(1),external/jawt)
+
+$(call gb_LinkTarget_add_ldflags,$(1),\
+	-L$(call gb_CustomTarget_get_workdir,external/jawt) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	-ljawt \
 )
 
 endef

external/mingw-externals/Module_mingw-externals.mk

@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,mingw-externals))
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call gb_Module_add_targets,mingw-externals,\
 	CustomTarget_jawt \
-	Package_jawt \
 	Package_mingw_dlls \
 	Package_mingw_gccdlls \
 ))

external/mingw-externals/Package_jawt.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt)))
-
-$(error FIXME do not deliver this stuff to OUTDIR)
-
-$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab: