diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-16 21:11:11 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-16 20:46:13 +0000 |
| commit | 82a3c3f702e78232ebd4671c0061aa817bbd146b (patch) | |
| tree | 8e166e85bfa1524a0c9d3aaf4c38c9e4f68eb702 | |
| parent | f46cb0c45a3e00057c1bcf73ac850ef44d470b9d (diff) | |
move mingw-externals to subdir
Change-Id: I324225ac397d8e4bb1f58f0b8040eb08b7142ee9
Reviewed-on: https://gerrit.libreoffice.org/6277
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | external/Module_external.mk | 7 | ||||
| -rw-r--r-- | external/mingw-externals/CustomTarget_jawt.mk (renamed from external/CustomTarget_jawt.mk) | 0 | ||||
| -rw-r--r-- | external/mingw-externals/Module_mingw-externals.mk | 21 | ||||
| -rw-r--r-- | external/mingw-externals/Package_jawt.mk (renamed from external/Package_jawt.mk) | 0 | ||||
| -rw-r--r-- | external/mingw-externals/Package_mingw_dlls.mk (renamed from external/Package_mingw_dlls.mk) | 0 | ||||
| -rw-r--r-- | external/mingw-externals/Package_mingw_gccdlls.mk (renamed from external/Package_mingw_gccdlls.mk) | 0 |
6 files changed, 22 insertions, 6 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 9cbf58837c1a..506c03aa517e 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -10,12 +10,7 @@ $(eval $(call gb_Module_Module,external)) ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_Module_add_targets,external,\ - CustomTarget_jawt \ - Package_jawt \ - Package_mingw_dlls \ - Package_mingw_gccdlls \ -)) +$(eval $(call gb_Module_add_moduledir,external,mingw-externals)) endif ifeq ($(COM),MSC) diff --git a/external/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk index 2d35d93a24c2..2d35d93a24c2 100644 --- a/external/CustomTarget_jawt.mk +++ b/external/mingw-externals/CustomTarget_jawt.mk diff --git a/external/mingw-externals/Module_mingw-externals.mk b/external/mingw-externals/Module_mingw-externals.mk new file mode 100644 index 000000000000..6d262d899f65 --- /dev/null +++ b/external/mingw-externals/Module_mingw-externals.mk @@ -0,0 +1,21 @@ +# -*- 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,mingw-externals)) + +ifeq ($(OS)$(COM),WNTGCC) +$(eval $(call gb_Module_add_targets,mingw-externals,\ + CustomTarget_jawt \ + Package_jawt \ + Package_mingw_dlls \ + Package_mingw_gccdlls \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk index cc58cf9f5ab2..cc58cf9f5ab2 100644 --- a/external/Package_jawt.mk +++ b/external/mingw-externals/Package_jawt.mk diff --git a/external/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk index c85032a3c60e..c85032a3c60e 100644 --- a/external/Package_mingw_dlls.mk +++ b/external/mingw-externals/Package_mingw_dlls.mk diff --git a/external/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk index 521db37da155..521db37da155 100644 --- a/external/Package_mingw_gccdlls.mk +++ b/external/mingw-externals/Package_mingw_gccdlls.mk |