external/CustomTarget_jawt.mk | 33 ---------------------
external/Module_external.mk | 7 ----
external/Package_jawt.mk | 14 --------
external/Package_mingw_dlls.mk | 18 -----------
external/Package_mingw_gccdlls.mk | 17 ----------
external/mingw-externals/CustomTarget_jawt.mk | 33 +++++++++++++++++++++
external/mingw-externals/Module_mingw-externals.mk | 21 +++++++++++++
external/mingw-externals/Package_jawt.mk | 14 ++++++++
external/mingw-externals/Package_mingw_dlls.mk | 18 +++++++++++
external/mingw-externals/Package_mingw_gccdlls.mk | 17 ++++++++++
10 files changed, 104 insertions(+), 88 deletions(-)
New commits:
commit 82a3c3f702e78232ebd4671c0061aa817bbd146b
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Oct 16 21:11:11 2013 +0200
move mingw-externals to subdir
Change-Id: I324225ac397d8e4bb1f58f0b8040eb08b7142ee9
Reviewed-on: https://gerrit.libreoffice.org/6277
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 9cbf588..506c03a 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
similarity index 100%
rename from external/CustomTarget_jawt.mk
rename to external/mingw-externals/CustomTarget_jawt.mk
diff --git a/external/Package_jawt.mk
b/external/mingw-externals/Module_mingw-externals.mk
similarity index 56%
copy from external/Package_jawt.mk
copy to external/mingw-externals/Module_mingw-externals.mk
index cc58cf9..6d262d8 100644
--- a/external/Package_jawt.mk
+++ b/external/mingw-externals/Module_mingw-externals.mk
@@ -7,8 +7,15 @@
# 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_Module_Module,mingw-externals))
-$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a))
+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 shiftwidth=4 tabstop=4 noexpandtab:
+# vim: set noet sw=4 ts=4:
diff --git a/external/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk
similarity index 100%
rename from external/Package_jawt.mk
rename to external/mingw-externals/Package_jawt.mk
diff --git a/external/Package_mingw_dlls.mk
b/external/mingw-externals/Package_mingw_dlls.mk
similarity index 100%
rename from external/Package_mingw_dlls.mk
rename to external/mingw-externals/Package_mingw_dlls.mk
diff --git a/external/Package_mingw_gccdlls.mk
b/external/mingw-externals/Package_mingw_gccdlls.mk
similarity index 100%
rename from external/Package_mingw_gccdlls.mk
rename to external/mingw-externals/Package_mingw_gccdlls.mk
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
