summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-10-17 00:52:25 +0200
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2013-10-17 10:35:03 +0000
commit6cef5936a9cf9e004b6940edfaf57493558332b9 (patch)
tree294b2225a9ec1fb1d23098f33c6372fe8a598d9d
parent15be40969c107f073a3fa7f5fd67e8012ffdcbb3 (diff)
fdo#70393: move afms to a subdir of external
Change-Id: I73d7998a9a36d466b4c6d9cac408506a42bceebf Reviewed-on: https://gerrit.libreoffice.org/6280 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/afms/ExternalPackage_fontunxafm.mk (renamed from afms/ExternalPackage_fontunxafm.mk)0
-rw-r--r--external/afms/Makefile (renamed from afms/Makefile)0
-rw-r--r--external/afms/Module_afms.mk (renamed from afms/Module_afms.mk)0
-rw-r--r--external/afms/README (renamed from afms/README)0
-rw-r--r--external/afms/UnpackedTarball_afms.mk (renamed from afms/UnpackedTarball_afms.mk)0
7 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 27b3c07cf805..111d3b566e5e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_Module,libreoffice))
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
- $(call gb_Helper_optional,AFMS,afms) \
android \
animations \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 48d7842c5c34..a141b65ebcd1 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
endif
$(eval $(call gb_Module_add_moduledirs,external,\
+ $(call gb_Helper_optional,AFMS,afms) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))
diff --git a/afms/ExternalPackage_fontunxafm.mk b/external/afms/ExternalPackage_fontunxafm.mk
index 936b1af6e709..936b1af6e709 100644
--- a/afms/ExternalPackage_fontunxafm.mk
+++ b/external/afms/ExternalPackage_fontunxafm.mk
diff --git a/afms/Makefile b/external/afms/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/afms/Makefile
+++ b/external/afms/Makefile
diff --git a/afms/Module_afms.mk b/external/afms/Module_afms.mk
index 5e0c75052272..5e0c75052272 100644
--- a/afms/Module_afms.mk
+++ b/external/afms/Module_afms.mk
diff --git a/afms/README b/external/afms/README
index 78be83a38c46..78be83a38c46 100644
--- a/afms/README
+++ b/external/afms/README
diff --git a/afms/UnpackedTarball_afms.mk b/external/afms/UnpackedTarball_afms.mk
index feed2f94853e..feed2f94853e 100644
--- a/afms/UnpackedTarball_afms.mk
+++ b/external/afms/UnpackedTarball_afms.mk