summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-10-16 15:12:54 +0200
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2013-10-16 16:20:08 +0000
commit29a5707821f9ec386d5f6b90f7838db9cdff1263 (patch)
treeab38fd008aa9f1b272dac8ce2881e495ae93b200 /external
parent203a8bbd00e30d0e251a7d0705f26775a0c1d3a6 (diff)
move MSVC externals to subdir
see http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html for details Change-Id: I5ebf3a6162a8f977d1ddf0d445f076afd53332e4 Reviewed-on: https://gerrit.libreoffice.org/6265 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'external')
-rw-r--r--external/Module_external.mk7
-rw-r--r--external/msc-externals/Module_msc-externals.mk19
-rw-r--r--external/msc-externals/Package_dbghelp.mk (renamed from external/Package_dbghelp.mk)0
-rw-r--r--external/msc-externals/Package_msms.mk (renamed from external/Package_msms.mk)0
-rw-r--r--external/msc-externals/Package_msvc80_dlls.mk (renamed from external/Package_msvc80_dlls.mk)0
-rw-r--r--external/msc-externals/Package_msvc_dlls.mk (renamed from external/Package_msvc_dlls.mk)0
6 files changed, 20 insertions, 6 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 99e49752d40d..4f7ce0ae580e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -22,12 +22,7 @@ $(eval $(call gb_Module_add_targets,external,\
endif
ifeq ($(COM),MSC)
-$(eval $(call gb_Module_add_targets,external,\
- Package_dbghelp \
- $(if $(MSM_PATH),Package_msms) \
- Package_msvc_dlls \
- $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
-))
+$(eval $(call gb_Module_add_moduledir,external,msc-externals))
endif
ifeq ($(HAVE_READDIR_R),NO)
diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk
new file mode 100644
index 000000000000..1caa327fc64f
--- /dev/null
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -0,0 +1,19 @@
+# -*- 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,msc-externals))
+
+$(eval $(call gb_Module_add_targets,msc-externals,\
+ Package_dbghelp \
+ $(if $(MSM_PATH),Package_msms) \
+ Package_msvc_dlls \
+ $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk
index 438783938152..438783938152 100644
--- a/external/Package_dbghelp.mk
+++ b/external/msc-externals/Package_dbghelp.mk
diff --git a/external/Package_msms.mk b/external/msc-externals/Package_msms.mk
index 283e11317b88..283e11317b88 100644
--- a/external/Package_msms.mk
+++ b/external/msc-externals/Package_msms.mk
diff --git a/external/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk
index 5e510801d818..5e510801d818 100644
--- a/external/Package_msvc80_dlls.mk
+++ b/external/msc-externals/Package_msvc80_dlls.mk
diff --git a/external/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk
index dd68f10c4f95..dd68f10c4f95 100644
--- a/external/Package_msvc_dlls.mk
+++ b/external/msc-externals/Package_msvc_dlls.mk