convert external to gbuild

Change-Id: I7127db6aad9e97a0f3e758aa83b22ac8465d3f43

.gitignore

@@ -98,13 +98,6 @@
 /*/*.exe
 /solenv/gdb/libreoffice/*.pyo
 /solenv/gdb/libreoffice/util/*.pyo
-
-# external dlls etc: that should be reworkded too.
-/external/*/*.dll
-/external/*/*.exe
-/external/*/*.manifest
-/external/*/*.txt
-/external/*/*.msm
 /moz/zipped/*.zip
 
 

Makefile.fetch

@@ -79,7 +79,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,VISIO,VISIO_TARBALL) \
 	,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item)))
 	$(foreach item, \
-		4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz \
 		$(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
 		$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \
 		$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)) \
@@ -93,6 +92,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,CPPUNIT,$(CPPUNIT_TARBALL)) \
 		$(call fetch_Optional,CT2N,$(CT2N_TARBALL)) \
 		$(call fetch_Optional,CURL,$(CURL_TARBALL)) \
+		$(call fetch_Optional,DBGHELP,$(DBGHELP_DLL)) \
 		$(call fetch_Optional,EPM,$(EPM_TARBALL)) \
 		$(call fetch_Optional,EXPAT,$(EXPAT_TARBALL)) \
 		$(call fetch_Optional,MORE_FONTS,$(FONT_DEJAVU_TARBALL)) \
@@ -108,6 +108,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \
 		$(GOOGLE_DOCS_EXTENSION_PACK) \
 		$(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \
+		$(call fetch_Optional,GLIBC,$(GLIBC_TARBALL)) \
 		$(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \
 		$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
 		$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \

Repository.mk

@@ -648,6 +648,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     cosv \
     dtobj \
 	findsofficepath \
+	gnu_getopt \
+	gnu_readdir_r \
     headless \
     libeay32 \
     npsoenv \

RepositoryModule_ooo.mk

@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	eventattacher \
 	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
+	external \
 	extras \
 	fileaccess \
 	filter \

config_host.mk.in

@@ -324,6 +324,7 @@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@
 export MD5SUM=@MD5SUM@
 export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
 export MERGELIBS=@MERGELIBS@
+export MERGE_MODULES=@MERGE_MODULES@
 export MFC_INCLUDE=@MFC_INCLUDE@
 export MFC_LIB=@MFC_LIB@
 export MINGWCXX=@MINGWCXX@
@@ -388,6 +389,9 @@ export MKDEPENDSOLVER=TRUE
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
 export MOC=@MOC@
+export MSM_PATH=@MSM_PATH@
+export MSVC_DLL_PATH=@MSVC_DLL_PATH@
+export MSVC_DLLS=@MSVC_DLLS@
 export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
 export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
 export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@

configure.ac

@@ -3292,9 +3292,8 @@ AC_SUBST(SHOWINCLUDES_PREFIX)
 # dbghelp.dll
 #
 if test "$_os" == "WINNT"; then
-    DBGHELP_DLL="13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll"
+    BUILD_TYPE="$BUILD_TYPE DBGHELP"
 fi
-AC_SUBST(DBGHELP_DLL)
 
 #
 # unowinreg.dll
@@ -4876,8 +4875,7 @@ find_winsdk()
     done
 }
 
-#TODO: move copy_* functions to external/ module once gbuildified
-copy_msms()
+find_msms()
 {
     for ver in 9.0 10.0 11.0; do
         reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
@@ -4894,65 +4892,43 @@ copy_msms()
         AC_MSG_ERROR([Merge modules not found])
     fi
 
-    if test $VCVER -eq 90; then
-        cp $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm ./external/msm90
-        if test $? -ne 0; then
-            AC_MSG_ERROR([Failed to copy merge modules])
-        fi
-    fi
-    cp $msmdir/Microsoft_VC${VCVER}_CRT_x86.msm ./external/msm${VCVER}
-    if test $? -ne 0; then
-        AC_MSG_ERROR([Failed to copy merge modules])
-    fi
-    cp $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm ./external/msm${VCVER}
-    if test $? -ne 0; then
+    msms="Microsoft_VC${VCVER}_CRT_x86.msm"
+    if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
+        msms="$msms Microsoft_VC${VCVER}_CRT_x64.msm"
+    else
         AC_MSG_WARN([Failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension])
     fi
+    if test "$VCVER" = "90"; then
+        if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
+            msms="$msms policy_9_0_Microsoft_VC90_CRT_x86.msm"
+        else
+            AC_MSG_ERROR([Merge modules not found])
+        fi
+    fi
 }
 
-copy_msvc_dlls()
+find_msvc_dlls()
 {
-    if test $CPUNAME == INTEL; then
+    if test "$CPUNAME" = "INTEL"; then
         vsarch=x86
     else
         vsarch=amd64
     fi
 
-    if test -f $VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT/msvcp${VCVER}.dll; then
-        vsdlldir=$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT
-    else
-        AC_MSG_ERROR([can not find VS dll $VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT/msvcp${VCVER}.dll])
+    msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT"
+    msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll"
+    if test "$VCVER" = "90"; then
+        msvcdlls="$msvcdlls msvcm90.dll Microsoft.VC90.CRT.manifest"
     fi
 
-    cp $vsdlldir/msvcp${VCVER}.dll $vsdlldir/msvcr${VCVER}.dll ./external/msvcp${VCVER}
-
-    if test $VCVER == 90; then
-        cp $vsdlldir/msvcm${VCVER}.dll $vsdlldir/Microsoft.VC90.CRT.manifest ./external/msvcp${VCVER}
-        if test $? -ne 0; then
-            AC_MSG_ERROR([Failed to copy VS dlls])
+    for dll in $msvcdlls; do
+        if ! test -f "$msvcdllpath/$dll"; then
+            AC_MSG_ERROR([can not find $dll in $msvcdllpath])
         fi
-    fi
-}
-
-copy_dbghelp_dll()
-{
-    if test ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/$DBGHELP_DLL; then
-        cp $TARFILE_LOCATION/$DBGHELP_DLL ./external/dbghelp/dbghelp.dll;
-    fi
-    if test ! -f ./external/dbghelp/dbghelp.dll; then
-        echo "dbghelp.dll is missing in external/dbghelp/."
-        echo "Get it from the Microsoft site and put it there."
-        echo "(Note: Microsoft seems to enjoy changing the exact location of this file."
-        echo "You may have to search Microsoft's website.) Last time it was seen at:"
-        echo "<http://www.microsoft.com/downloads/release.asp?releaseid=30682>."
-        exit 1
-    fi
+    done
 }
 
 if test "$build_os" = "cygwin"; then
-    copy_msvc_dlls
-    copy_dbghelp_dll
-
     dnl Check midl.exe
     AC_MSG_CHECKING([for midl.exe])
 
@@ -5967,16 +5943,20 @@ if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then
 fi
 AC_SUBST([JITC_PROCESSOR_TYPE])
 
+# Misc Windows Stuff
 if test $_os = "WINNT" -a "$WITH_MINGW" != yes; then
-    AC_MSG_CHECKING([for Microsoft_VC${VCVER}_CRT_x86.msm])
-        copy_msms
-    if test -n $msms_copied ; then
-        AC_MSG_RESULT([yes])
-        SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
-    else
-        AC_MSG_RESULT([no])
-    fi
+    find_msvc_dlls
+    find_msms
+    MSVC_DLL_PATH="$msvcdllpath"
+    MSVC_DLLS="$msvcdlls"
+    MSM_PATH="$msmdir"
+    MERGE_MODULES="$msms"
+    SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
 fi
+AC_SUBST(MSVC_DLL_PATH)
+AC_SUBST(MSVC_DLLS)
+AC_SUBST(MSM_PATH)
+AC_SUBST(MERGE_MODULES)
 
 dnl ===================================================================
 dnl Checks for Java
@@ -8974,6 +8954,11 @@ else
     HAVE_READDIR_R=NO
     SYSTEM_LIBC=YES
 fi
+
+if test "$HAVE_GETOPT" = NO -o "$HAVE_READDIR_R" = NO; then
+    BUILD_TYPE="$BUILD_TYPE GLIBC"
+fi
+
 AC_SUBST(HAVE_GETOPT)
 AC_SUBST(HAVE_READDIR_R)
 AC_SUBST(SYSTEM_LIBC)

download.lst

@@ -18,6 +18,7 @@ export CMIS_TARBALL := b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
 export CPPUNIT_TARBALL := ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
 export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 export CURL_TARBALL := 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
+export DBGHELP_DLL := 4003e34416ebd25e4c115d49dc15e1a7-dbghelp.dll
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
@@ -32,6 +33,7 @@ export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-f
 export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz
 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
 export GRAPHITE_TARBALL := f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
+export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz

external/CustomTarget_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_CustomTarget_CustomTarget,external/jawt))
+
+$(eval $(call gb_CustomTarget_register_target,external/jawt,libjawt.dll.a))
+
+$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:| \
+	$(call gb_CustomTarget_get_workdir,external/jawt)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	echo EXPORTS > $@
+	echo "JAWT_GetAWT@8" >> $@
+
+$(call gb_CustomTarget_get_target,external/jawt)/libjawt.dll.a: \
+	$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
+	$(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/mingw-dlls/makefile.mk → external/CustomTarget_mingw_dlls.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+# This file is part of the LibreOffice project.
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# 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/.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Tor Lillqvist <tml@iki.fi> (initial developer)
-# Jan Holesovsky <kendy@suse.cz>
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-PRJ=..
-PRJNAME=external
-TARGET=mingw-dlls
-
-.INCLUDE: settings.mk
 
-# ------------------------------------------------------------------
+$(eval $(call gb_CustomTarget_CustomTarget,external/mingw-dlls))
 
-.IF "$(GUI)$(COM)" != "WNTGCC"
-
-dummy:
-    @echo "Nothing to do."
-
-.ELSE
-
-MINGW_DLLS:= \
+MINGW_DLLS := \
     $(MINGW_BOOST_DATE_TIME_DLL) \
     $(MINGW_CAIRO_DLL) \
     $(MINGW_CRYPTO_DLL) \
@@ -93,32 +61,23 @@ MINGW_DLLS:= \
     $(MINGW_SSL_DLL) \
     $(MINGW_TASN1_DLL) \
     $(MINGW_TERMCAP_DLL) \
-    $(MINGW_ZLIB_DLL)
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-MINGW_DLLS+=$(MINGW_GCCDLL)
-.ENDIF
+    $(MINGW_ZLIB_DLL) \
+    $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
+    $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL))
 
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-MINGW_DLLS+=$(MINGW_GXXDLL)
-.ENDIF
-
-# Guesstimate where the DLLs can be
-
-POTENTIAL_MINGW_RUNTIME_BINDIRS = \
+POTENTIAL_MINGW_RUNTIME_BINDIRS := \
 	$(COMPATH)/$(HOST_PLATFORM)/sys-root/mingw/bin \
-	/usr/$(HOST_PLATFORM)/sys-root/mingw/bin \
-
-all:
-	@for DLL in $(MINGW_DLLS) ; do \
-	    for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \
-	       test -f $$D/$$DLL && $(COPY) -p $$D/$$DLL $(BIN)$/ && break; \
-	    done ; \
-	    test -f $(BIN)$/$$DLL || { echo Could not find $$DLL in none of $(POTENTIAL_MINGW_RUNTIME_BINDIRS) ; exit 1 ; } ; \
-	done
+	/usr/$(HOST_PLATFORM)/sys-root/mingw/bin
 
-.ENDIF
+$(eval $(call gb_CustomTarget_register_targets,external/wine,\
+	$(MINGW_DLLS) \
+))
 
-# ------------------------------------------------------------------
+$(call gb_CustomTarget_get_workdir,external/mingw-dlls)/%.dll: $(firstword $(wildcard $(foreach dir,$(POTENTIAL_MINGW_RUNTIME_BINDIRS), $(dir)/%)))
+	if ! test -f $<; then \
+		echo Could not find $*.dll in any of $(POTENTIAL_MINGW_RUNTIME_BINDIRS); \
+	fi
+	$(call gb_Output_announce,$*,$(true),CPY,1)
+	cp $< $*
 
-.INCLUDE: target.mk
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/CustomTarget_wine.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_CustomTarget_CustomTarget,external/wine))
+
+$(eval $(call gb_CustomTarget_register_targets,external/wine,\
+	libgdiplus.dll.a \
+	libmsi.dll.a \
+	liburlmod.dll.a \
+))
+
+$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a: $(call gb_CustomTarget_get_workdir,external/wine)/%.def | \
+	$(call gb_CustomTarget_get_workdir,external/wine)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
+	$(DLLTOOL) --kill-at --input-def=$< --output-lib=$@ --dllname=$*.dll
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

external/Module_external.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_Module_Module,external))
+
+$(eval $(call gb_Module_add_targets,external,\
+))
+
+ifeq ($(GUI)$(COM),WNTGCC)
+$(eval $(call gb_Module_add_targets,external,\
+	CustomTarget_jawt \
+	CustomTarget_mingw_dlls \
+	CustomTarget_wine \
+	Package_jawt \
+	Package_mingw_dlls \
+	Package_wine \
+))
+endif
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,external,\
+	Package_dbghelp \
+	Package_msms \
+	Package_msvc_dlls \
+))
+endif
+
+ifeq ($(HAVE_GETOPT),NO)
+$(eval $(call gb_Module_add_targets,external,\
+	UnpackedTarball_glibc \
+	StaticLibrary_gnu_getopt \
+))
+endif
+
+ifeq ($(HAVE_READDIR_R),NO)
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,external,\
+	$(if $(filter YES,$(HAVE_GETOPT)),UnpackedTarball_glibc) \
+	StaticLibrary_gnu_readdir_r \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:

external/Package_dbghelp.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,dbghelp,$(TARFILE_LOCATION)))
+
+$(eval $(call gb_Package_add_file,dbghelp,bin/dbghelp.dll,$(DBGHELP_DLL)))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/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)))
+
+$(eval $(call gb_Package_add_file,jawt,libjawt.dll.a,lib/libjawt.dll.a))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/Package_mingw_dlls.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_dlls,$(call gb_CustomTarget_get_workdir,external/mingw_dlls)))
+
+$(eval $(call gb_Package_add_files,mingw_dlls,bin,\
+	$(MINGW_DLLS) \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/Package_msms.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,msms,$(MSM_PATH)))
+
+$(eval $(call gb_Package_add_files,msms,bin,\
+	$(MERGE_MODULES) \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/Package_msvc_dlls.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,msvc_dlls,$(MSVC_DLL_PATH)))
+
+$(eval $(call gb_Package_add_files,msvc_dlls,bin,\
+	$(MSVC_DLLS) \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/Package_wine.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,dbghelp,$(call gb_CustomTarget_get_workdir,external/wine)))
+
+$(eval $(call gb_Package_add_files,dbghelp,lib,\
+	gdiplus.dll.a \
+	msi.dll.a \
+	urlmon.dll.a \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/StaticLibrary_gnu_getopt.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_StaticLibrary_StaticLibrary,gnu_getopt))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,gnu_getopt,glibc))
+
+$(eval $(call gb_StaticLibrary_set_include,gnu_getopt,\
+    -I$(call gb_UnpackedTarball_get_dir,glibc) \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_defs,gnu_getopt,\
+    -DHAVE_STRING_H \
+    -DHAVE_CONFIG_H \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,gnu_getopt,\
+    UnpackedTarball/glibc/posix/getopt \
+    UnpackedTarball/glibc/posix/getopt1 \
+))
+
+# vim: set noet sw=4 ts=4:

external/StaticLibrary_gnu_readdir_r.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_StaticLibrary_StaticLibrary,gnu_readdir_r))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,gnu_readdir_r,glibc))
+
+$(eval $(call gb_StaticLibrary_set_include,gnu_readdir_r,\
+    -I$(call gb_UnpackedTarball_get_dir,glibc) \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_defs,gnu_readdir_r,\
+    -DHAVE_STRING_H \
+    -DHAVE_CONFIG_H \
+))
+
+$(eval $(call gb_StaticLibrary_add_cobjects,gnu_readdir_r,\
+    external/glibc/readdir_r \
+))
+
+# vim: set noet sw=4 ts=4:

external/UnpackedTarball_glibc.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_UnpackedTarball_UnpackedTarball,glibc))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,glibc,$(GLIBC_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_files,glibc,posix,\
+	external/glibc/config.h \
+	external/glibc/readdir_r.c \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,glibc,\
+	external/glibc/glibc-2.1.3.patch \
+))
+
+# vim: set noet sw=4 ts=4:

external/dbghelp/README_dbghelp.dll

-Put the dbghelp.dll in this directory for Windows builds.

external/gcc3_specific/makefile.mk

-PRJ=..
-PRJNAME=external
-TARGET=gcc3_specific
-
-# ------------------------------------------------------------------
-.INCLUDE: settings.mk
-# ------------------------------------------------------------------
-
-.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
-
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-
-.EXPORT : CC
-
-.IF "$(OS)"=="AIX"
-
-all .SEQUENTIAL : $(LB)$/libstdc++.a $(LB)$/libgcc_s.a
-
-$(LB)$/libstdc++.a :
-    $(GCCINSTLIB) libstdc++.a $(LB)
-
-$(LB)$/libgcc_s.a :
-    $(GCCINSTLIB) libgcc_s.a $(LB)
-
-.ELSE
-
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
-
-
-$(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
-    $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
-
-$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
-    $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
-
-.ENDIF
-
-.ENDIF 
-
-.ENDIF
-
-.INCLUDE: target.mk
-

external/glibc-2.1.3.patch

---- misc/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:50 2008
-+++ misc/build/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:26 2008
-@@ -1 +1,42 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifdef WNT
-+#include <stdlib.h>
-+#define getenv getenv
-+#endif
-+
-+
-+#if defined(MACOSX)
-+//Workaround for MACOS
-+#define getopt my_neues_getopt
-+#define opterr my_neues_opterr
-+#define optind my_neues_optind
-+#define optopt my_neues_optopt
-+#endif
-+
-+
---- misc/glibc-2.1.3/posix/getopt.h	Sun Aug 27 16:11:33 2000
-+++ misc/build/glibc-2.1.3/posix/getopt.h	Mon Mar 31 09:42:01 2008
-@@ -131,7 +131,7 @@
- /* Many other libraries have conflicting prototypes for getopt, with
-    differences in the consts, in stdlib.h.  To avoid compilation
-    errors, only prototype getopt for the GNU C library.  */
--extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-+extern int getopt (int argc, char *const *argv, const char *shortopts);
- # else /* not __GNU_LIBRARY__ */
- extern int getopt ();
- # endif /* __GNU_LIBRARY__ */
-@@ -137,14 +137,14 @@
- # endif /* __GNU_LIBRARY__ */
- 
- # ifndef __need_getopt
--extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
-+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- 		        const struct option *__longopts, int *__longind);
--extern int getopt_long_only (int __argc, char *const *__argv,
-+extern int getopt_long_only (int argc, char *const *argv,
- 			     const char *__shortopts,
- 		             const struct option *__longopts, int *__longind);
- 
- /* Internal only.  Users should not call this directly.  */
--extern int _getopt_internal (int __argc, char *const *__argv,
-+extern int _getopt_internal (int argc, char *const *argv,
- 			     const char *__shortopts,
- 		             const struct option *__longopts, int *__longind,
- 			     int __long_only);
---- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
-+++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,71 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=external
-+TARGET=gnu_getopt
-+LIBTARGET=NO
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+SOLARINC+=-I.. 
-+UWINAPILIB=
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+CDEFS+=-DHAVE_STRING_H  -DHAVE_CONFIG_H
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(HAVE_GETOPT)" != "YES"
-+OBJFILES=	$(OBJ)$/getopt.obj		\
-+			$(OBJ)$/getopt1.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(OBJFILES)
-+.ENDIF
-+
-+.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
-+TARGET2=gnu_readdir_r
-+OBJFILES+= $(OBJ)$/readdir_r.obj
-+LIB2TARGET=$(SLB)$/$(TARGET2).lib
-+LIB2ARCHIV=$(LB)$/lib$(TARGET2).a
-+LIB2OBJFILES= $(OBJ)$/readdir_r.obj
-+.ENDIF
-+
-+.IF "$(HAVE_READDIR_R)" == "YES" && "$(HAVE_GETOPT)" == "YES"
-+@all:
-+	@echo "Nothing to do here.
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
---- misc/glibc-2.1.3/posix/readdir_r.c	Mon Mar 31 09:43:50 2008
-+++ misc/build/glibc-2.1.3/posix/readdir_r.c	Mon Mar 31 09:42:01 2008
-@@ -1 +1,56 @@
--dummy
-+/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+#include <errno.h>
-+#include <limits.h>
-+#include <stddef.h>
-+#include <string.h>
-+#include <dirent.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <assert.h>
-+
-+#ifndef __READDIR_R
-+# define __READDIR_R readdir_r
-+# define DIRENT_TYPE struct dirent
-+#endif
-+
-+/* Read a directory entry from DIRP.  */
-+int
-+__READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
-+{
-+  DIRENT_TYPE *dp;
-+  size_t reclen;
-+
-+  errno = 0; 
-+  /* call our non-reentrant counterpart to get the information */
-+  dp = readdir(dirp);
-+
-+  /* copy the result into entry */
-+  if (dp != NULL) {
-+    reclen = dp->d_reclen;           /* This might be NetBSD-specific 
-+				      * Add #ifdef's if anything else needed */
-+    *result = memcpy(entry, dp, reclen); 
-+  } else {
-+    *result = NULL;
-+  }
-+
-+  return dp != NULL ? 0 : errno ? errno : 0; 
-+}
-+
-+

external/glibc/config.h

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifdef WNT
+#include <stdlib.h>
+#define getenv getenv
+#endif
+
+
+#if defined(MACOSX)
+//Workaround for MACOS
+#define getopt my_neues_getopt
+#define opterr my_neues_opterr
+#define optind my_neues_optind
+#define optopt my_neues_optopt
+#endif

external/glibc/glibc-2.1.3.patch

+--- misc/glibc-2.1.3/posix/getopt.h	Sun Aug 27 16:11:33 2000
++++ misc/build/glibc-2.1.3/posix/getopt.h	Mon Mar 31 09:42:01 2008
+@@ -131,7 +131,7 @@
+ /* Many other libraries have conflicting prototypes for getopt, with
+    differences in the consts, in stdlib.h.  To avoid compilation
+    errors, only prototype getopt for the GNU C library.  */
+-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
++extern int getopt (int argc, char *const *argv, const char *shortopts);
+ # else /* not __GNU_LIBRARY__ */
+ extern int getopt ();
+ # endif /* __GNU_LIBRARY__ */
+@@ -137,14 +137,14 @@
+ # endif /* __GNU_LIBRARY__ */
+
+ # ifndef __need_getopt
+-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
++extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+		        const struct option *__longopts, int *__longind);
+-extern int getopt_long_only (int __argc, char *const *__argv,
++extern int getopt_long_only (int argc, char *const *argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind);
+
+ /* Internal only.  Users should not call this directly.  */
+-extern int _getopt_internal (int __argc, char *const *__argv,
++extern int _getopt_internal (int argc, char *const *argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only);

external/glibc/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=external
-TARGET=getopt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(HAVE_GETOPT)" != "YES" || "$(HAVE_READDIR_R)" != "YES"
-TARFILE_NAME=glibc-2.1.3-stub
-TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
-TARFILE_ROOTDIR=glibc-2.1.3
-ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
-.IF "$(HAVE_READDIR_R)" != "YES"
-ADDITIONAL_FILES += posix$/readdir_r.c
-.ENDIF
-
-PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
-
-CONFIGURE_ACTION=
-
-BUILD_DIR=posix
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-OUT2INC= \
-    posix/getopt.h \
-    posix/config.h
-
-.ELSE
-
-@all:
-# nothing
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-

external/glibc/readdir_r.c

+/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <errno.h>
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <assert.h>
+
+#ifndef __READDIR_R
+# define __READDIR_R readdir_r
+# define DIRENT_TYPE struct dirent
+#endif
+
+/* Read a directory entry from DIRP.  */
+int
+__READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
+{
+  DIRENT_TYPE *dp;
+  size_t reclen;
+
+  errno = 0;
+  /* call our non-reentrant counterpart to get the information */
+  dp = readdir(dirp);
+
+  /* copy the result into entry */
+  if (dp != NULL) {
+    reclen = dp->d_reclen;           /* This might be NetBSD-specific
+                                      * Add #ifdef's if anything else needed */
+    *result = memcpy(entry, dp, reclen);
+  } else {
+    *result = NULL;
+  }
+
+  return dp != NULL ? 0 : errno ? errno : 0;
+}

external/jawt/makefile.mk

-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PRJ=..
-PRJNAME=external
-TARGET=libjawt
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)$(COM)" != "WNTGCC" ||  "$(CROSS_COMPILING)" != "YES"
-
-ALL:
-    @echo Nothing needed for this configuration
-
-.ENDIF
-
-all: $(LB)/libjawt.dll.a
-
-$(LB)/libjawt.dll.a:
-    (echo EXPORTS; echo JAWT_GetAWT@8) >$(MISC)/jawt.def
-    $(DLLTOOL) --input-def=$(MISC)/jawt.def --output-lib=$@ --dllname=jawt.dll
-
-.INCLUDE :  target.mk

external/mingwheaders/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=external
-TARGET=mingwheaders
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-
-.IF "$(CROSS_COMPILING)" != "YES"
-
-# Don't do any of this for now. We support WNTGCC (MinGW) only as
-# cross-compiler. It is dubious whether it would be legal to copy
-# stuff from the Windows SDK to a cross-compilation build host
-# anyway. Some headers and/or import libraries missing in MinGW (or
-# mingw-w64 actually) we have copied from Wine in ../wine.
-
-MINGW_INCLUDE_DIR=$(COMPATH)$/include/
-MINGW_W32API_INCLUDE_DIR=$(COMPATH)$/include/
-MINGW_W32API_LIB_DIR=$(COMPATH)$/lib/
-
-SYS_INCLUDE_DIR=$(MINGW_INCLUDE_DIR)$/sys/
-
-PSDK_INCLUDE_DIR=$(PSDK_HOME)$/include$/
-
-ATL_INCLUDE_DIR=$(PSDK_HOME)$/include$/atl$/
-
-DIRECTXSDK_INCLUDE_DIR=$(DIRECTXSDK_HOME)$/include$/
-
-FILES_TO_COPY_FROM_MINGW= \
-    excpt.h \
-     tchar.h
-
-FILES_TO_COPY_FROM_W32API= \
-    amvideo.h \
-    basetyps.h \
-    objidl.h \
-    specstrings.h \
-    uxtheme.h \
-    winbase.h \
-    windef.h \
-    wininet.h \
-    winver.h \
-    wtypes.h
-
-FILES_TO_COPY_FROM_SYS= \
-    stat.h
-
-FILES_TO_COPY_FROM_PSDK= \
-    adoctint.h \
-    adodef.h \
-    adoguids.h \
-    adoint.h \
-    bcrypt.h \
-    commctrl.h \
-    control.h \
-    dispex.h \
-    filter.h \
-    gdiplusbitmap.h \
-    gdiplusbrush.h \
-    gdiplusenums.h \
-    gdiplusfont.h \
-    gdiplusheaders.h \
-    gdiplusimageattributes.h \
-    gdiplusimaging.h \
-    gdiplusmatrix.h \
-    gdipluspath.h \
-    gdipluspen.h \
-    gdiplusregion.h \
-    gdiplusstringformat.h \
-    imm.h \
-    imagehlp.h \
-    mapiwin.h \
-    msdasc.h \
-    msi.h \
-    msiquery.h \
-    multimon.h \
-    ntquery.h \
-    oaidl.h \
-    ocidl.h \
-    oleauto.h \
-    olectl.h \
-    oledb.h \
-    oleidl.h \
-    propidl.h \
-    propkeydef.h \
-    propsys.h \
-    propvarutil.h \
-    shlobj.h \
-    shobjidl.h \
-    shtypes.h \
-    sspi.h \
-    strmif.h \
-    strsafe.h \
-    structuredquery.h \
-    urlmon.h \
-    wincrypt.h \
-    winerror.h \
-    wingdi.h \
-    wintrust.h \
-    winuser.h \
-    wspiapi.h \
-    exdispid.h \
-    dshow.h \
-    gdiplus.h \
-    msxml.h \
-    ncrypt.h \
-    shlguid.h \
-    transact.h
-
-.IF "$(DISABLE_ATL)"==""
-MINGWHEADER_ATL_PATCH_TARGET=$(MISC)$/mingwheader_atl_patch
-MINGWHEADER_ATL_COPY_TARGET=$(MISC)$/mingwheader_atl_copy
-FILES_TO_COPY_FROM_ATL= \
-    atlbase.h \
-    atlcom.h \
-    atlconv.h \
-    atlctl.h \
-    atlwin.h \
-    statreg.h
-.ENDIF
-
-FILES_TO_COPY_FROM_DIRECTXSDK= \
-    d3dtypes.h \
-    d3dx9core.h \
-    d3dx9math.h \
-    d3dx9math.inl \
-    dxtrans.h \
-    d3dx9.h
-
-$(MISC)$/mingwheader_patch_all : $(MISC)$/mingwheader_patch $(MINGWHEADER_ATL_PATCH_TARGET) $(LB)$/libmsvcrt.a
-
-$(MISC)$/mingwheader_patch : $(MISC)$/mingwheader_copy
-    patch -bd $(MISC)$/mingw -p0 -N -f -Z <mingw_headers.patch
-    $(TOUCH) $(MISC)$/mingwheader_patch
-
-.IF "$(DISABLE_ATL)"==""
-$(MINGWHEADER_ATL_PATCH_TARGET) : $(MINGWHEADER_ATL_COPY_TARGET)
-    patch -bd $(MISC)$/mingw -p0 -N -f -Z <mingw_atl_headers.patch
-    $(TOUCH) $(MINGWHEADER_ATL_PATCH_TARGET)
-.ENDIF
-
-$(MISC)$/mingwheader_copy:
-    $(MKDIRHIER) $(MISC)$/mingw$/include
-    $(MKDIRHIER) $(MISC)$/mingw$/include/sys
-    $(COPY) $(FILES_TO_COPY_FROM_MINGW:^$(MINGW_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(COPY) $(FILES_TO_COPY_FROM_W32API:^$(MINGW_W32API_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(COPY) $(FILES_TO_COPY_FROM_SYS:^$(SYS_INCLUDE_DIR)) $(MISC)$/mingw$/include$/sys
-    $(COPY) $(FILES_TO_COPY_FROM_PSDK:^$(PSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(COPY) $(FILES_TO_COPY_FROM_DIRECTXSDK:^$(DIRECTXSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(TOUCH) $(MISC)$/mingwheader_copy
-
-.IF "$(DISABLE_ATL)"==""
-$(MINGWHEADER_ATL_COPY_TARGET):
-    $(MKDIRHIER) $(MISC)$/mingw$/include/atl
-    $(COPY) $(FILES_TO_COPY_FROM_ATL:^$(ATL_INCLUDE_DIR)) $(MISC)$/mingw$/include$/atl
-     $(TOUCH) $(MINGWHEADER_ATL_COPY_TARGET)
-.ENDIF
-
-$(LB)$/libmsvcrt.a:
-.IF "$(USE_MINGW)" == "cygwin"
-    $(COPY) $(COMPATH)$/lib/mingw/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
-.ELSE
-    $(COPY) $(COMPATH)$/lib/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
-.ENDIF
-    cd $(LB) && ar -x libmsvcrt_orig.a ofmt_stub.o
-    ar -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
-    nm -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
-    echo EXPORTS > $(MISC)$/msvcrt.def
-    sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def
-    -sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \
-        sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def
-    cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def
-    dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
-    cd $(LB) && ar -rs libmsvcrt.a ofmt_stub.o
-
-clean:
-    -$(RM) $(MISC)$/mingw$/include$/*.h
-    -$(RM) $(MISC)$/mingwheader_copy
-    -$(RM) $(MISC)$/mingwheader_patch
-
-.ENDIF
-
-.ENDIF
-
-.INCLUDE :  target.mk
-

external/msm100/README_msm100.txt

-Put
-Microsoft_VC100_CRT_x86.msm
-into this directory for Windows builds using a VS 2010 / VC 10.0 compiler.
-For builds with --enable-dbgutil also put
-Microsoft_VC100_DebugCRT_x86.msm
-here.

external/msm110/README_msm110.txt

-Put
-Microsoft_VC110_CRT_x86.msm
-into this directory for Windows builds using a VS 2012 / VC 11.0 compiler.
-For builds with --enable-dbgutil also put
-Microsoft_VC110_DebugCRT_x86.msm
-here.

external/msm90/README_msm90.txt

-Put
-Microsoft_VC90_CRT_x86.msm
-and
-policy_9_0_Microsoft_VC90_CRT_x86.msm
-into this directory for Windows builds using a VS 2008 / VC 9.0 compiler.
-For builds with --enable-dbgutil also put
-Microsoft_VC90_DebugCRT_x86.msm
-and
-policy_9_0_Microsoft_VC90_DebugCRT_x86.msm
-here.

external/msvcp100/README_msvcX100.dll

-Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a
-VS 2010 / VC 10.0 compiler.

external/msvcp110/README_msvcX110.dll

-Put msvcp110.dll, msvcr110.dll in this directory for Windows builds using a
-VS 2012 / VC 11.0 compiler.

external/msvcp80/README_msvcX80.dll

-Put the msvcp80.dll, msvcr80.dll and Microsoft.VC80.CRT.manifest in this
-directory for Windows builds using VS 2005, or using prebuilt Mozilla DLLs
-that were built using VS 2005.

external/msvcp90/README_msvcX90.dll

-Put msvcm90.dll, msvcp90.dll, msvcr90.dll and Microsoft.VC90.CRT.manifest
-in this directory for Windows builds using a VS 2008 / VC 9.0 compiler.

external/prj/build.lst

 el      external :       soltools NULL
 el	external					usr1 - all el_mkout NULL
-el	external\glibc		nmake	-	all	el_glibc NULL
-el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL
-el	external\mingwheaders		nmake	-	w	el_mingwheaders NULL
-el	external\mingw-dlls		nmake	-	w	el_mingwdlls NULL
-el	external\jawt		nmake	-	w	el_jawt NULL
-el	external\wine		nmake	-	w	el_wine NULL

external/prj/d.lst

-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\glibc
-mkdir: %_DEST%\inc\external\mingw
-mkdir: %_DEST%\inc\external\mingw\include
-mkdir: %_DEST%\inc\external\mingw\include\atl
-mkdir: %_DEST%\inc\external\mingw\include\sys
-mkdir: %_DEST%\inc\external\wine
-
-..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h
-..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h
-
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib\libgnu_getopt.a
-..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib\libgnu_getopt_static.a
-
-..\%__SRC%\inc\*.h %_DEST%\inc\external\glibc\*.h
-
-..\%__SRC%\inc\wine\*.h %_DEST%\inc\external\wine\*.h
-
-..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc\external\mingw\include\*
-..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc\external\mingw\include\atl\*
-..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc\external\mingw\include\sys\*
-
-..\%__SRC%\lib\libautorec*.* %_DEST%\lib\lib*.*
-
-..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib\libgcc_s.so.*
-..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib\libstdc++.so.*
-
-..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll
-
-..\msvcp80\msvcm80*.dll %_DEST%\bin
-..\msvcp80\msvcp80*.dll %_DEST%\bin
-..\msvcp80\msvcr80*.dll %_DEST%\bin
-..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin\Microsoft.VC80.DebugCRT.manifest
-
-..\msvcp90\msvcm90*.dll %_DEST%\bin
-..\msvcp90\msvcp90*.dll %_DEST%\bin
-..\msvcp90\msvcr90*.dll %_DEST%\bin
-..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
-..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
-..\msm90\*.msm %_DEST%\bin
-..\msm100\*.msm %_DEST%\bin
-..\msm110\*.msm %_DEST%\bin
-
-..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
-
-..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.*
-
-..\%__SRC%\lib\libgdiplus.dll.a %_DEST%\lib\libgdiplus.dll.a
-..\%__SRC%\lib\libmsi.dll.a %_DEST%\lib\libmsi.dll.a
-..\%__SRC%\lib\liburlmon.dll.a %_DEST%\lib\liburlmon.dll.a
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
-
-..\%__SRC%\lib\libjawt.dll.a %_DEST%\lib\libjawt.dll.a
-
-linklib: libgcc_s.*.*
-

external/unowinreg/README

-Copy unowinreg.dll from http://tools.openoffice.org/unowinreg_prebuild/680/
-here... [ or rebuild it using --with-mingwin= ]

vcl/Library_vcl.mk

@@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
 $(eval $(call gb_Library_set_include,vcl,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
-	$(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \
+	$(if $(filter WNTGCC,$(OS)$(COM)),-I$(SRCDIR)/external/wine/include) \
 ))
 
 $(eval $(call gb_Library_add_defs,vcl,\