find lots of external static libraries in UnpackedTarball dir

Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:

ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)

Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24

13 files changed, 147 insertions, 114 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index db86275c3d89..4db3dd15827e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -378,12 +378,18 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,mythes) \
 	$$(INCLUDE) \
 )
+
+ifeq ($(COM),MSC)
 $(call gb_LinkTarget_use_package,$(1),\
 	mythes \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	mythes \
 )
+else
+$(call gb_LinkTarget_add_libs,$(1),$(MYTHES_LIBS))
+$(call gb_LinkTarget_use_external_project,$(1),mythes)
+endif
 
 endef
 
@@ -453,9 +459,15 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,hyphen)\
 	$$(INCLUDE) \
 )
+
+ifeq ($(COM),MSC)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	hyphen \
 )
+else
+$(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB))
+$(call gb_LinkTarget_use_external_project,$(1),hyphen)
+endif
 
 endef
 
@@ -472,6 +484,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(HUNSPELL_LIBS))
 
 endef
 
+gb_ExternalProject__use_hunspell :=
+
 else # !SYSTEM_HUNSPELL
 
 define gb_LinkTarget__use_hunspell
@@ -483,9 +497,20 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\
 	$$(INCLUDE) \
 )
+
+ifeq ($(COM),MSC)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	hunspell \
 )
+else
+$(call gb_LinkTarget_add_libs,$(1),$(HUNSPELL_LIBS))
+$(call gb_LinkTarget_use_external_project,$(1),hunspell)
+endif
+
+endef
+
+define gb_ExternalProject__use_hunspell
+$(call gb_ExternalProject_use_external_project,$(1),hunspell)
 
 endef
 
@@ -690,15 +715,23 @@ endef
 else # !SYSTEM_LIBEXTTEXTCAT
 
 define gb_LinkTarget__use_libexttextcat
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	exttextcat \
-)
-
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \
 	$$(INCLUDE) \
 )
 
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+	exttextcat \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,exttextcat)/src/.libs/libexttextcat-2.0.a\
+)
+$(call gb_LinkTarget_use_external_project,$(1),mythes)
+endif
+
+
 endef
 
 endif # SYSTEM_LIBEXTTEXTCAT
@@ -825,9 +858,8 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,langtag) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	langtag \
-)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
+$(call gb_LinkTarget_use_external_project,$(1),langtag)
 
 endef
 
@@ -1216,16 +1248,11 @@ else # SYSTEM_HARFBUZZ != YES
 
 define gb_LinkTarget__use_harfbuzz
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,harfbuzz)/src \
+	$(HARFBUZZ_CFLAGS) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	harfbuzz \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	harfbuzz \
-	harfbuzz-icu \
-)
+$(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
+$(call gb_LinkTarget_use_external_project,$(1),harfbuzz)
 
 endef
 
@@ -1288,10 +1315,11 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 	ssl \
 )
 else
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	crypto \
-	ssl \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \
+	$(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \
 )
+$(call gb_LinkTarget_use_external_project,$(1),openssl)
 ifeq ($(OS),SOLARIS)
 $(call gb_LinkTarget_add_libs,$(1),\
 	-lnsl \
@@ -1358,13 +1386,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libcdr)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libcdr \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	cdr-0.0 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libcdr)/src/lib/.libs/libcdr-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
-
+$(call gb_LinkTarget_use_external_project,$(1),libcdr)
 endef
 
 endif # SYSTEM_CDR
@@ -1388,12 +1413,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libodfgen \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	odfgen-0.0 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libodfgen)/src/.libs/libodfgen-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libodfgen)
 
 endef
 
@@ -1418,12 +1441,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libmspub)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libmspub \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	mspub-0.0 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libmspub)/src/lib/.libs/libmspub-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libmspub)
 
 endef
 
@@ -1448,12 +1469,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libvisio)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libvisio \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	visio-0.0 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libvisio)/src/lib/.libs/libvisio-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libvisio)
 
 endef
 
@@ -1479,16 +1498,14 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$(WPD_CFLAGS) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libwpd \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	wpd-0.9 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libwpd)/src/lib/.libs/libwpd-0.9$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libwpd)
 
 endef
 define gb_ExternalProject__use_wpd
-$(call gb_ExternalProject_use_package,$(1),libwpd)
+$(call gb_ExternalProject_use_external_project,$(1),libwpd)
 
 endef
 
@@ -1514,16 +1531,14 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libwpg \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	wpg-0.2 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libwpg)/src/lib/.libs/libwpg-0.2$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libwpg)
 
 endef
 define gb_ExternalProject__use_wpg
-$(call gb_ExternalProject_use_package,$(1),libwpg)
+$(call gb_ExternalProject_use_external_project,$(1),libwpg)
 
 endef
 
@@ -1549,16 +1564,14 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libwps \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	wps-0.2 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs/libwps-0.2$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libwps)
 
 endef
 define gb_ExternalProject__use_wps
-$(call gb_ExternalProject_use_package,$(1),libwps)
+$(call gb_ExternalProject_use_external_project,$(1),libwps)
 
 endef
 
@@ -1583,12 +1596,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
-	libmwaw \
-)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	mwaw-0.1 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libmwaw)/src/lib/.libs/libmwaw-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
+$(call gb_LinkTarget_use_external_project,$(1),libmwaw)
 
 endef
 
@@ -1959,7 +1970,7 @@ endef
 else # !SYSTEM_POPPLER
 
 define gb_LinkTarget__use_poppler
-$(call gb_LinkTarget_use_package,$(1),poppler)
+$(call gb_LinkTarget_use_external_project,$(1),poppler)
 
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,poppler) \
@@ -1968,10 +1979,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	fofi \
-	goo \
-	poppler \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,poppler)/fofi/.libs/libfofi$(gb_StaticLibrary_PLAINEXT) \
+	$(call gb_UnpackedTarball_get_dir,poppler)/goo/.libs/libgoo$(gb_StaticLibrary_PLAINEXT) \
+	$(call gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT) \
 )
 
 ifeq ($(OS),MACOSX)
@@ -2072,6 +2083,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+gb_ExternalProject__use_openldap :=
+
 else ifeq ($(SYSTEM_OPENLDAP),NO)
 
 define gb_LinkTarget__use_openldap
@@ -2080,17 +2093,23 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,openldap/include) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_package,$(1),openldap)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	ldap \
-	lber \
+$(call gb_LinkTarget_use_external_project,$(1),openldap)
+$(call gb_LinkTarget_add_libs,$(1), \
+	$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs/libldap.a \
+	$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs/liblber.a \
 )
 
 endef
 
+define gb_ExternalProject__use_openldap
+$(call gb_ExternalProject_use_external_project,$(1),openldap)
+
+endef
+
 else # no openldap
 
 gb_LinkTarget__use_openldap :=
+gb_ExternalProject__use_openldap :=
 
 endif # SYSTEM_OPENLDAP
 
@@ -2175,9 +2194,7 @@ else # !SYSTEM_POSTGRESQL
 
 define gb_LinkTarget__use_postgresql
 
-$(call gb_LinkTarget_use_packages,$(1),\
-	postgresql \
-)
+$(call gb_LinkTarget_use_external_project,$(1),postgresql)
 
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \
@@ -2185,8 +2202,8 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	$(if $(filter MSC,$(COM)),lib)pq \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 )
 
 ifeq ($(OS)$(COM),WNTMSC)
@@ -2477,12 +2494,14 @@ endef
 else # !SYSTEM_LIBORCUS
 
 define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_unpacked,$(1),liborcus)
+$(call gb_LinkTarget_use_external_project,$(1),liborcus)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_static_libraries,$(1),orcus)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \
+)
 
 $(if $(filter YES,$(SYSTEM_BOOST)), \
     $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
@@ -2492,8 +2511,9 @@ $(if $(filter YES,$(SYSTEM_BOOST)), \
 endef
 
 define gb_LinkTarget__use_orcus-parser
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	orcus-parser \
+$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.6$(gb_StaticLibrary_PLAINEXT) \
 )
 
 endef
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 1aac70226948..90420f63dde3 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -33,12 +33,11 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 	./configure \
 		$(if $(debug),STRIP=" ") \
 		CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \
-		LDFLAGS='-L$(OUTDIR)/lib' \
 		$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
 		pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
 		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
 		COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
-		ZLIB3RDLIB=-lz \
+		ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
 		png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
 		png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
 		$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
diff --git a/configure.ac b/configure.ac
index 16ce33eb319b..4befd0339386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7683,7 +7683,7 @@ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.0])
 dnl ===================================================================
 dnl Check for system libwpd
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 >= 0.9.5 libwpd-stream-0.9 >= 0.9.5],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"])
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 >= 0.9.5 libwpd-stream-0.9 >= 0.9.5],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs -lwpd-0.9"])
 
 dnl ===================================================================
 dnl Check for system lcms2
@@ -7733,12 +7733,12 @@ AC_SUBST([SYSTEM_FREETYPE])
 dnl ===================================================================
 dnl Check for system libwps
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${WORKDIR}/UnpackedTarball/libwps/inc"],["-L${OUTDIR}/lib -lwpslib"])
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${WORKDIR}/UnpackedTarball/libwps/inc"],["-L${WORKDIR}/UnpackedTarball/libwps/src/lib/.libs -lwps-0.2"])
 
 dnl ===================================================================
 dnl Check for system libwpg
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${WORKDIR}/UnpackedTarball/libwpg/inc"],["-L${OUTDIR}/lib -lwpglib"])
+libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${WORKDIR}/UnpackedTarball/libwpg/inc"],["-L${WORKDIR}/UnpackedTarball/libwpg/src/lib/.libs -lwpg-0.2"])
 
 # ===================================================================
 # Check for system libxslt
@@ -8121,7 +8121,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         AC_MSG_RESULT([internal])
         SYSTEM_MARIADB=NO
         MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
-        MARIADB_LIBS="-L${OUTDIR}/lib -lmariadblib"
+        MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
         BUILD_TYPE="$BUILD_TYPE MARIADB"
     fi
 
@@ -8994,9 +8994,9 @@ if test $_os != WINNT -a $_os != Darwin -a $_os != iOS; then
     AC_MSG_RESULT([yes])
     ENABLE_HARFBUZZ="TRUE"
     if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
+        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz -lharfbuzz-icu"])
     else
-        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
+        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10],[-I${WORKDIR}/UnpackedTarball/harfbuzz/src],[${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a ${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz-icu.a])
     fi
 else
     AC_MSG_RESULT([no])
@@ -9281,7 +9281,11 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_HUNSPELL=NO
     HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell"
-    HUNSPELL_LIBS="-L${OUTDIR}/lib -lhunspell"
+    if test "$COM" = "MSC"; then
+        HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
+    else
+        HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs -lhunspell-1.3"
+    fi
     BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
 AC_SUBST(SYSTEM_HUNSPELL)
@@ -9315,6 +9319,11 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_HYPH=NO
     BUILD_TYPE="$BUILD_TYPE HYPHEN"
+    if test "$COM" = "MSC"; then
+        HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib"
+    else
+        HYPHEN_LIB="-L${WORKDIR}/UnpackedTarball/hyphen/.libs -lhyphen"
+    fi
 fi
 AC_SUBST(SYSTEM_HYPH)
 AC_SUBST(HYPHEN_LIB)
@@ -9348,6 +9357,11 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_MYTHES=NO
     BUILD_TYPE="$BUILD_TYPE MYTHES"
+    if test "$COM" = "MSC"; then
+        MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib"
+    else
+        MYTHES_LIBS="-L${WORKDIR}/UnpackedTarball/mythes/.libs -lmythes-1.2"
+    fi
 fi
 AC_SUBST(SYSTEM_MYTHES)
 AC_SUBST(MYTHES_CFLAGS)
@@ -11642,6 +11656,11 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
         SYSTEM_LIBLANGTAG=NO
         AC_MSG_RESULT([no])
         BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
+        if test "$COM" = "MSC"; then
+            LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
+        else
+            LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs -llangtag"
+        fi
     fi
 else
     AC_MSG_RESULT([no])
@@ -11655,7 +11674,7 @@ dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
 
-libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/png"],["-L${OUTDIR}/lib -lpng"])
+libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/png"],["-L${WORKDIR}/LinkTarget/StaticLibrary -lpng"])
 
 dnl ===================================================================
 dnl Check for runtime JVM search path
diff --git a/hyphen/ExternalProject_hyphen.mk b/hyphen/ExternalProject_hyphen.mk
index 1afb444eb82e..e7d36730fd70 100644
--- a/hyphen/ExternalProject_hyphen.mk
+++ b/hyphen/ExternalProject_hyphen.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,hyphen))
 
-$(eval $(call gb_ExternalProject_use_package,hyphen,hunspell))
+$(eval $(call gb_ExternalProject_use_external,hyphen,hunspell))
 
 $(eval $(call gb_ExternalProject_register_targets,hyphen,\
 	build \
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 43b46213575a..5790131b1df6 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -38,7 +38,7 @@ endif
 ifeq ($(SYSTEM_BOOST),YES)
 liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
 else
-liborcus_LIBS+=$(SOLARLIB) -lboostsystem
+liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem
 endif
 ifeq ($(OS),ANDROID)
 liborcus_LIBS+=-lgnustl_shared -lm
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 7eb367bdfd35..8681cc292e12 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,mythes))
 
-$(eval $(call gb_ExternalProject_use_package,mythes,hunspell))
+$(eval $(call gb_ExternalProject_use_external,mythes,hunspell))
 
 $(eval $(call gb_ExternalProject_register_targets,mythes,\
 	build \
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index 428ededc2457..1cbaed077c78 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -9,9 +9,8 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,postgresql))
 
-$(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
-
 $(eval $(call gb_ExternalProject_use_externals,postgresql,\
+	openldap \
 	openssl \
 	zlib \
 ))
@@ -43,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
 			$(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\
 			-I$(call gb_UnpackedTarball_get_dir,openssl/include))" \
 			$(if $(filter NO,$(SYSTEM_OPENLDAP)), \
-			LDFLAGS="-L$(OUTDIR)/lib" \
+			LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs -L$(OUTDIR)/lib" \
 			EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
 			) \
 		&& cd src/interfaces/libpq \
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index e79a28e0fdc3..3abf24a0d938 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -80,8 +80,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			)" \
 		$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
 		LDFLAGS="$(strip $(LDFLAGS) \
-			$(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(OUTDIR)/lib) \
-			$(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(OUTDIR)/lib) \
+			$(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(call gb_UnpackedTarball_get_dir,openssl)) \
+			$(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(gb_StaticLibrary_WORKDIR)) \
 			$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
 			$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
 				$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 47172ce82521..279ffea44db9 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -29,9 +29,12 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\
 ))
 
 $(eval $(call gb_Library_use_externals,scfilt,\
+	orcus \
+	orcus-parser \
 	boost_headers \
 	boostsystem \
 	mdds_headers \
+	zlib \
 ))
 
 $(eval $(call gb_Library_use_libraries,scfilt,\
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 83c4e232d075..e892815d13bd 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -426,6 +426,7 @@ endef
 
 # static members declared here because they are used globally
 
+gb_StaticLibrary_WORKDIR = $(WORKDIR)/LinkTarget/StaticLibrary
 gb_Library_WORKDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library
 gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
 gb_Executable_BINDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Executable
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index 5bb7fdaf6014..2033ca063483 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -54,8 +54,8 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
     mspub \
 	odfgen \
 	visio \
-	wpd \
 	wpg \
+	wpd \
 	zlib \
 ))
 
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index 7dc5203d1a15..502668fbdc1e 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -51,9 +51,9 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
 	boost_headers \
 	mwaw \
 	odfgen \
-	wpd \
-	wpg \
 	wps \
+	wpg \
+	wpd \
 	zlib \
 ))
 
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index e8fb908e9162..164bec2a983b 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -32,17 +32,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_NO_XSLT \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
-	xmlsec1 \
-))
-else
-$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\
-	xmlsec1 \
-))
-endif
-
-
 $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
 	comphelper \
 	cppu \
@@ -88,6 +77,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 ))
 
 $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
+	xmlsec1 \
 	xmlsec1-mscrypto \
 ))
 
@@ -115,11 +105,13 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 
 ifeq ($(OS)$(CROSS_COMPILING),WNTYES)
 $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
+	xmlsec1 \
 	xmlsec1-nss \
 ))
 else
-$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\
-	xmlsec1-nss \
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
 ))
 endif