one variable to rule them all

one variable to find them,
one variable to deliver them all and into filelist put them,
in $INSTDIR where the installer searches.

Change-Id: I989f578f0ed6f9ef9167522249b36d95c15bfd1b

config_host.mk.in

@@ -331,62 +331,15 @@ export MFC_INCLUDE=@MFC_INCLUDE@
 export MFC_LIB=@MFC_LIB@
 export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
-export MINGW_BOOST_DATE_TIME_DLL=@MINGW_BOOST_DATE_TIME_DLL@
-export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
 export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
-export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@
-export MINGW_CURL_DLL=@MINGW_CURL_DLL@
-export MINGW_EXPAT_DLL=@MINGW_EXPAT_DLL@
-export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@
-export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
+export MINGW_DLLS=@MINGW_DLLS@
 export MINGW_GCCDLL=@MINGW_GCCDLL@
-export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@
-export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@
-export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@
-export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
 export MINGW_GXXDLL=@MINGW_GXXDLL@
-export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@
-export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@
-export MINGW_ICONV_DLL=@MINGW_ICONV_DLL@
-export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@
-export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
-export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
-export MINGW_IDN_DLL=@MINGW_IDN_DLL@
-export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
-export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
-export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
-export MINGW_LIBLANGTAG_DLL=@MINGW_LIBLANGTAG_DLL@
-export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
-export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
-export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@
-export MINGW_MYTHES_DLL=@MINGW_MYTHES_DLL@
-export MINGW_NEON_DLL=@MINGW_NEON_DLL@
-export MINGW_NSPR4_DLL=@MINGW_NSPR4_DLL@
-export MINGW_NSS3_DLL=@MINGW_NSS3_DLL@
-export MINGW_NSSUTIL3_DLL=@MINGW_NSSUTIL3_DLL@
-export MINGW_PIXMAN_DLL=@MINGW_PIXMAN_DLL@
-export MINGW_PLC4_DLL=@MINGW_PLC4_DLL@
-export MINGW_PLDS4_DLL=@MINGW_PLDS4_DLL@
-export MINGW_PNG15_DLL=@MINGW_PNG15_DLL@
-export MINGW_POPPLER_DLL=@MINGW_POPPLER_DLL@
-export MINGW_PYTHON_DLL=@MINGW_PYTHON_DLL@
 export MINGW_PYTHON_EXE=@MINGW_PYTHON_EXE@
-export MINGW_RAPTOR_DLL=@MINGW_RAPTOR_DLL@
-export MINGW_RASQAL_DLL=@MINGW_RASQAL_DLL@
-export MINGW_READLINE_DLL=@MINGW_READLINE_DLL@
-export MINGW_REDLAND_DLL=@MINGW_REDLAND_DLL@
 export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
 export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
 export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
-export MINGW_SMIME3_DLL=@MINGW_SMIME3_DLL@
-export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@
-export MINGW_SSH2_DLL=@MINGW_SSH2_DLL@
-export MINGW_SSL3_DLL=@MINGW_SSL3_DLL@
-export MINGW_SSL_DLL=@MINGW_SSL_DLL@
 export MINGW_SYSROOT=@MINGW_SYSROOT@
-export MINGW_TASN1_DLL=@MINGW_TASN1_DLL@
-export MINGW_TERMCAP_DLL=@MINGW_TERMCAP_DLL@
-export MINGW_ZLIB_DLL=@MINGW_ZLIB_DLL@
 export MKDEPENDSOLVER=TRUE
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@

external/Module_external.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,external,\
 	CustomTarget_wine \
 	Package_jawt \
 	Package_mingw_dlls \
+	Package_mingw_gccdlls \
 	Package_wine \
 ))
 endif

external/Package_mingw_dlls.mk

@@ -9,61 +9,10 @@
 
 $(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
 
+$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTDIR)))
+
 $(eval $(call gb_Package_add_files,mingw_dlls,bin,\
-    $(MINGW_BOOST_DATE_TIME_DLL) \
-    $(MINGW_CAIRO_DLL) \
-    $(MINGW_CRYPTO_DLL) \
-    $(MINGW_CURL_DLL) \
-    $(MINGW_EXPAT_DLL) \
-    $(MINGW_FONTCONFIG_DLL) \
-    $(MINGW_FREETYPE_DLL) \
-    $(MINGW_GCRYPT_DLL) \
-    $(MINGW_GLIB_DLL) \
-    $(MINGW_GMODULE_DLL) \
-    $(MINGW_GNUTLS_DLL) \
-    $(MINGW_GPG_ERROR_DLL) \
-    $(MINGW_GRAPHITE2_DLL) \
-    $(MINGW_HUNSPELL_DLL) \
-    $(MINGW_HYPHEN_DLL) \
-    $(MINGW_ICONV_DLL) \
-    $(MINGW_ICUDATA_DLL) \
-    $(MINGW_ICUI18N_DLL) \
-    $(MINGW_ICUUC_DLL) \
-    $(MINGW_IDN_DLL) \
-    $(MINGW_INTL_DLL) \
-    $(MINGW_JPEG_DLL) \
-    $(MINGW_LCMS2_DLL) \
-    $(MINGW_LIBEXSLT_DLL) \
-    $(MINGW_LIBLANGTAG_DLL) \
-    $(MINGW_LIBXML_DLL) \
-    $(MINGW_LIBXSLT_DLL) \
-    $(MINGW_LPSOLVE_DLL) \
-    $(MINGW_MYTHES_DLL) \
-    $(MINGW_NEON_DLL) \
-    $(MINGW_NSPR4_DLL) \
-    $(MINGW_NSS3_DLL) \
-    $(MINGW_NSSUTIL3_DLL) \
-    $(MINGW_PIXMAN_DLL) \
-    $(MINGW_PYTHON_DLL) \
-    $(MINGW_PYTHON_EXE) \
-    $(MINGW_PLC4_DLL) \
-    $(MINGW_PLDS4_DLL) \
-    $(MINGW_PNG15_DLL) \
-    $(MINGW_POPPLER_DLL) \
-    $(MINGW_RAPTOR_DLL) \
-    $(MINGW_RASQAL_DLL) \
-    $(MINGW_READLINE_DLL) \
-    $(MINGW_REDLAND_DLL) \
-    $(MINGW_SQLITE3_DLL) \
-    $(MINGW_SMIME3_DLL) \
-    $(MINGW_SSH2_DLL) \
-    $(MINGW_SSL3_DLL) \
-    $(MINGW_SSL_DLL) \
-    $(MINGW_TASN1_DLL) \
-    $(MINGW_TERMCAP_DLL) \
-    $(MINGW_ZLIB_DLL) \
-    $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
-    $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
+    $(sort $(MINGW_DLLS)) \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/Package_mingw_gccdlls.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,mingw_gccdlls,$(MINGW_SYSROOT)/bin))
+
+$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\
+    $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
+    $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

m4/mingw.m4

@@ -24,10 +24,10 @@ dnl the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
 dnl in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 dnl instead of those above.
 
-# libo_MINGW_CHECK_DLL(variable-infix,dll-name-stem,[action-if-found],[action-if-not-found])
+# libo_MINGW_CHECK_DLL(dll-name-stem,[action-if-found],[action-if-not-found])
 #
-# Checks for presence of dll dll-name-stem . Sets variable
-# MINGW_variable-infix_DLL if found, issues an error otherwise.
+# Checks for presence of dll dll-name-stem . Appends the dll name to
+# variable MINGW_DLLS if found, issues an error otherwise.
 #
 # It recognizes these dll patterns (x, y match any character, but they
 # are supposed to be numerals):
@@ -38,62 +38,63 @@ dnl instead of those above.
 #
 #
 # Example:
-# libo_MINGW_CHECK_DLL([EXPAT], [libexpat])
-# might result in MINGW_EXPAT_DLL=libexpat-1.dll being set.
+# MINGW_DLLS=
+# libo_MINGW_CHECK_DLL([libexpat])
+# might result in MINGW_DLLS containing libexpat-1.dll .
 #
-# uses CC, WITH_MINGW
+# uses MINGW_SYSROOT, WITH_MINGW
+# changes MINGW_DLLS
 # ------------------------------------------------------------------------------------------
 AC_DEFUN([libo_MINGW_CHECK_DLL],
-[AC_ARG_VAR([MINGW_][$1][_DLL],[output variable containing the found dll name])dnl
+[dnl
 
 if test -n "$WITH_MINGW"; then
     _libo_mingw_dlldir="[$MINGW_SYSROOT]"/bin
     _libo_mingw_dllname=
-    AC_MSG_CHECKING([for $2 dll])
+    AC_MSG_CHECKING([for $1 dll])
 
     dnl try one- or two-numbered version
-    _libo_mingw_try_dll([$2][-?.dll])
+    _libo_mingw_try_dll([$1][-?.dll])
     if test "$_libo_mingw_dllname" = ""; then
-        _libo_mingw_try_dll([$2][-??.dll])
+        _libo_mingw_try_dll([$1][-??.dll])
     fi
     dnl maybe the version contains a dot (e.g., libdb)
     if test "$_libo_mingw_dllname" = ""; then
-        _libo_mingw_try_dll([$2][-?.?.dll])
+        _libo_mingw_try_dll([$1][-?.?.dll])
     fi
     dnl maybe the version contains a dash (e.g., libpixman)
     if test "$_libo_mingw_dllname" = ""; then
-        _libo_mingw_try_dll([$2][-?-?.dll])
+        _libo_mingw_try_dll([$1][-?-?.dll])
     fi
     dnl maybe it is not versioned
     if test "$_libo_mingw_dllname" = ""; then
-        _libo_mingw_try_dll([$2][.dll])
+        _libo_mingw_try_dll([$1][.dll])
     fi
 
     if test "$_libo_mingw_dllname" = ""; then
         AC_MSG_RESULT([no])
-        m4_default([$4],[AC_MSG_ERROR([no dll found for $2])])
+        m4_default([$3],[AC_MSG_ERROR([no dll found for $1])])
     else
         AC_MSG_RESULT([$_libo_mingw_dllname])
-        [MINGW_][$1][_DLL]="$_libo_mingw_dllname"
-        m4_default([$3],[])
+        MINGW_DLLS="$MINGW_DLLS $_libo_mingw_dllname"
+        m4_default([$2],[])
     fi
 fi[]dnl
 ]) # libo_MINGW_CHECK_DLL
 
-# libo_MINGW_TRY_DLL(variable-infix,dll-name-stem)
+# libo_MINGW_TRY_DLL(dll-name-stem)
 #
-# Checks for presence of dll dll-name-stem . Sets variable
-# MINGW_variable-infix_DLL if found, does nothing otherwise.
+# Checks for presence of dll dll-name-stem . Appends the dll name to
+# variable MINGW_DLLS if found, does nothing otherwise.
 #
 # See libo_MINGW_CHECK_DLL for further info.
 #
-# uses CC, WITH_MINGW
+# uses MINGW_SYSROOT, WITH_MINGW
+# changes MINGW_DLLS
 # ------------------------------------------------
 AC_DEFUN([libo_MINGW_TRY_DLL],
-[dnl shortcut: do not test for already found dlls
-if test -z "$[MINGW_][$1][_DLL]"; then
-    libo_MINGW_CHECK_DLL([$1],[$2],[[]],[[]])
-fi[]dnl
+[dnl TODO: ignore already tested for dlls
+libo_MINGW_CHECK_DLL([$1],[[]],[[]])dnl
 ]) # libo_MINGW_TRY_DLL
 
 # _libo_mingw_try_dll(dll-name,dll-dir)

scp2/InstallModule_ooo.mk

@@ -97,55 +97,6 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 	MINGW_GXXDLL \
 ))
 
-$(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
-	MINGW_BOOST_DATE_TIME_DLL \
-	MINGW_CAIRO_DLL \
-	MINGW_CRYPTO_DLL \
-	MINGW_CURL_DLL \
-	MINGW_EXPAT_DLL \
-	MINGW_FONTCONFIG_DLL \
-	MINGW_FREETYPE_DLL \
-	MINGW_GCRYPT_DLL \
-	MINGW_GNUTLS_DLL \
-	MINGW_GPG_ERROR_DLL \
-	MINGW_GRAPHITE2_DLL \
-	MINGW_HUNSPELL_DLL \
-	MINGW_HYPHEN_DLL \
-	MINGW_ICONV_DLL \
-	MINGW_ICUDATA_DLL \
-	MINGW_ICUI18N_DLL \
-	MINGW_ICUUC_DLL \
-	MINGW_IDN_DLL \
-	MINGW_INTL_DLL \
-	MINGW_JPEG_DLL \
-	MINGW_LCMS2_DLL \
-	MINGW_LIBEXSLT_DLL \
-	MINGW_LIBLANGTAG_DLL \
-	MINGW_LIBXML_DLL \
-	MINGW_LIBXSLT_DLL \
-	MINGW_LPSOLVE_DLL \
-	MINGW_MYTHES_DLL \
-	MINGW_NEON_DLL \
-	MINGW_NSPR4_DLL \
-	MINGW_NSS3_DLL \
-	MINGW_NSSUTIL3_DLL \
-	MINGW_PIXMAN_DLL \
-	MINGW_PLC4_DLL \
-	MINGW_PLDS4_DLL \
-	MINGW_PNG15_DLL \
-	MINGW_POPPLER_DLL \
-	MINGW_RAPTOR_DLL \
-	MINGW_RASQAL_DLL \
-	MINGW_REDLAND_DLL \
-	MINGW_SMIME3_DLL \
-	MINGW_SQLITE3_DLL \
-	MINGW_SSH2_DLL \
-	MINGW_SSL3_DLL \
-	MINGW_SSL_DLL \
-	MINGW_TASN1_DLL \
-	MINGW_ZLIB_DLL \
-))
-
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	$(if $(WINDOWS_SDK_HOME),\
 		-DHAVE_WINDOWS_SDK \

scp2/source/ooo/mingw_dlls.scp

@@ -29,208 +29,12 @@
 
 #if defined(WNT) && defined( _gcc3 )
 
-#define MINGW_DLL(id,name) \
-    File id \
-        PACKED_LIB_FILE_BODY; \
-        Dir = gid_Brand_Dir_Program; \
-        Name = name; \
-        Styles = (PACKED); \
-    End
-
-#define MINGW_DLL_COND(cond,id,name) \
-
-
-#ifdef SYSTEM_EXPAT
-#ifdef NEEDS_MINGW_EXPAT_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_LIBXSLT
-#ifdef NEEDS_MINGW_LIBEXSLT_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )
-#endif
-#ifdef NEEDS_MINGW_LIBXSLT_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL )
-#endif
-#ifdef NEEDS_MINGW_ICONV_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Iconv, MINGW_ICONV_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_LIBXML
-#ifdef NEEDS_MINGW_ZLIB_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Zlib,    MINGW_ZLIB_DLL )
-#endif
-#ifdef NEEDS_MINGW_LIBXML_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, MINGW_LIBXML_DLL )
-#endif
-#endif
-
-#if defined SYSTEM_CURL || defined SYSTEM_NSS
-#ifdef NEEDS_MINGW_NSPR4_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr,     MINGW_NSPR4_DLL )
-#endif
-#ifdef NEEDS_MINGW_NSSUTIL3_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Nssutil,     MINGW_NSSUTIL3_DLL )
-#endif
-#ifdef NEEDS_MINGW_PLC4_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplc,      MINGW_PLC4_DLL )
-#endif
-#ifdef NEEDS_MINGW_PLDS4_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplds,     MINGW_PLDS4_DLL )
-#endif
-#ifdef NEEDS_MINGW_NSS3_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_nss,         MINGW_NSS3_DLL )
-#endif
-#ifdef NEEDS_MINGW_SSL3_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl,         MINGW_SSL3_DLL )
-#endif
-#ifdef NEEDS_MINGW_SMIME3_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_smime,         MINGW_SMIME3_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_CURL
-#ifdef NEEDS_MINGW_GPG_ERROR_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, MINGW_GPG_ERROR_DLL )
-#endif
-#ifdef NEEDS_MINGW_GCRYPT_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt,   MINGW_GCRYPT_DLL )
-#endif
-#ifdef NEEDS_MINGW_INTL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     MINGW_INTL_DLL )
-#endif
-#ifdef NEEDS_MINGW_IDN_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       MINGW_IDN_DLL )
-#endif
-#ifdef NEEDS_MINGW_SSH2_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh,      MINGW_SSH2_DLL )
-#endif
-#ifdef NEEDS_MINGW_CURL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcurl,     MINGW_CURL_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_ICU
-#ifdef NEEDS_MINGW_ICUI18N_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Icui18n, MINGW_ICUI18N_DLL )
-#endif
-#ifdef NEEDS_MINGW_ICUUC_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Icuuc,   MINGW_ICUUC_DLL )
-#endif
-#ifdef NEEDS_MINGW_ICUDATA_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, MINGW_ICUDATA_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_JPEG
-#ifdef NEEDS_MINGW_JPEG_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Jpeg, MINGW_JPEG_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_GRAPHITE
-#ifdef NEEDS_MINGW_GRAPHITE2_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_NEON
-#ifdef NEEDS_MINGW_TASN1_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn,   MINGW_TASN1_DLL )
-#endif
-#ifdef NEEDS_MINGW_GNUTLS_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgnutls, MINGW_GNUTLS_DLL )
-#endif
-#ifdef NEEDS_MINGW_NEON_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libneon,   MINGW_NEON_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_OPENSSL
-#ifdef NEEDS_MINGW_SSL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssl, MINGW_SSL_DLL )
-#endif
-#ifdef NEEDS_MINGW_CRYPTO_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcrypto, MINGW_CRYPTO_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_REDLAND
-#ifdef NEEDS_MINGW_RAPTOR_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libraptor, MINGW_RAPTOR_DLL )
-#endif
-#ifdef NEEDS_MINGW_RASQAL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Librasqal, MINGW_RASQAL_DLL )
-#endif
-#ifdef NEEDS_MINGW_SQLITE3_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libqslite, MINGW_SQLITE3_DLL )
-#endif
-#ifdef NEEDS_MINGW_REDLAND_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Librdf,    MINGW_REDLAND_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_HUNSPELL
-#ifdef NEEDS_MINGW_HUNSPELL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhunspell, MINGW_HUNSPELL_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_HYPH
-#ifdef NEEDS_MINGW_HYPHEN_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhyphen, MINGW_HYPHEN_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_MYTHES
-#ifdef NEEDS_MINGW_MYTHES_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libmythes, MINGW_MYTHES_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_LPSOLVE
-#ifdef NEEDS_MINGW_LPSOLVE_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Lpsolve, MINGW_LPSOLVE_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_CAIRO
-#ifdef NEEDS_MINGW_FONTCONFIG_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfontconfig, MINGW_FONTCONFIG_DLL )
-#endif
-#ifdef NEEDS_MINGW_FREETYPE_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfreetype,   MINGW_FREETYPE_DLL )
-#endif
-#ifdef NEEDS_MINGW_PIXMAN_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpixman,     MINGW_PIXMAN_DLL )
-#endif
-#ifdef NEEDS_MINGW_PNG15_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpng,        MINGW_PNG15_DLL )
-#endif
-#ifdef NEEDS_MINGW_CAIRO_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcairo,      MINGW_CAIRO_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_LCMS2
-#ifdef NEEDS_MINGW_LCMS2_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblcms2, MINGW_LCMS2_DLL )
-#endif
-#endif
-
-#if defined SYSTEM_BOOST
-#if defined NEEDS_MINGW_BOOST_DATE_TIME_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_POPPLER
-#ifdef NEEDS_MINGW_POPPLER_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpoppler, MINGW_POPPLER_DLL )
-#endif
-#endif
+File gid_Brand_File_Lib_Mingw_Dlls
+    TXT_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "mingw_dlls.filelist";
+    Styles = (FILELIST, PACKED);
+End
 
 #if defined(MINGW_GCCDLL)
 

solenv/gbuild/InstallModule.mk

@@ -70,11 +70,6 @@ $(call gb_InstallModuleTarget_define_value_if_set,$(1),$(2))
 
 endef
 
-define gb_InstallModule_define_mingw_dll_if_set
-$(call gb_InstallModuleTarget_define_mingw_dll_if_set,$(1),$(2))
-
-endef
-
 define gb_InstallModule_add_scpfile
 $(call gb_InstallModuleTarget_add_scpfile,$(1),$(2))
 

solenv/gbuild/InstallModuleTarget.mk

@@ -273,13 +273,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-define gb_InstallModuleTarget_define_mingw_dll_if_set
-$(call gb_InstallModuleTarget_add_defs,$(1),\
-	$(foreach def,$(2),$(if $($(def)),-DNEEDS_$(def) -D$(def)=\""$($(def))"\")) \
-)
-
-endef
-
 define gb_InstallModuleTarget_use_auto_install_libs
 $(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstallLibs_get_target,$(2))