From 1118f57582aaa7275a8fe1d1460e1515c111ac2e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 18 Mar 2012 09:18:28 +0100
Subject: mingw: avoid hardcoded dll versions and deps

The idea is to use libo_MINGW_CHECK_DLL for libs that must be available
(typically that would be the "main" library, e.g., libxml2 or libcurl)
and libo_MINGW_TRY_DLL for possible dependencies (that may not be the
same on different systems). All further references to the dlls are
exclusively through the configured variables or defines set from these
variables (e.g., instead of hardcoding libxml2-2.dll, use
$(MINGW_LIBXML2_DLL)).

The macros are documented in m4/mingw.m4 .

Files that must be changed when adding a new dll:
* configure.in
* config_host.mk.in
* external/mingw-dlls/makefile.mk
* scp2/source/ooo/makefile.mk
* scp2/source/ooo/mingw_dlls.scp
---
 external/mingw-dlls/makefile.mk | 42 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'external')

diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index e2e51a0b5697..7ca7cacc7dca 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -41,7 +41,47 @@ dummy:
 
 .ELSE
 
-MINGW_DLLS:=$(MINGW_EXTERNAL_DLLS)
+MINGW_DLLS:= \
+    $(MINGW_CAIRO_DLL) \
+    $(MINGW_CRYPTO_DLL) \
+    $(MINGW_CURL_DLL) \
+    $(MINGW_DB_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_ICUDATA_DLL) \
+    $(MINGW_ICUI18N_DLL) \
+    $(MINGW_ICUUC_DLL) \
+    $(MINGW_IDN_DLL) \
+    $(MINGW_INTL_DLL) \
+    $(MINGW_LCMS2_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_RAPTOR_DLL) \
+    $(MINGW_RASQAL_DLL) \
+    $(MINGW_REDLAND_DLL) \
+    $(MINGW_SQLITE3_DLL) \
+    $(MINGW_SSH2_DLL) \
+    $(MINGW_SSL3_DLL) \
+    $(MINGW_SSL_DLL) \
+    $(MINGW_TASN1_DLL) \
+    $(MINGW_ZLIB_DLL)
 
 .IF "$(MINGW_SHARED_GCCLIB)" == "YES"
 MINGW_DLLS+=$(MINGW_GCCDLL)
-- 
cgit