[Libreoffice-commits] core.git: afms/ExternalPackage_fontunxafm.mk afms/Makefile afms/Module_afms.mk afms/README afms/UnpackedTarball_afms.mk external/afms external/Module_external.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                    |    1 
 afms/ExternalPackage_fontunxafm.mk          |   48 ----------------------------
 afms/Makefile                               |    7 ----
 afms/Module_afms.mk                         |   17 ---------
 afms/README                                 |    1 
 afms/UnpackedTarball_afms.mk                |   14 --------
 external/Module_external.mk                 |    1 
 external/afms/ExternalPackage_fontunxafm.mk |   48 ++++++++++++++++++++++++++++
 external/afms/Makefile                      |    7 ++++
 external/afms/Module_afms.mk                |   17 +++++++++
 external/afms/README                        |    1 
 external/afms/UnpackedTarball_afms.mk       |   14 ++++++++
 12 files changed, 88 insertions(+), 88 deletions(-)

New commits:
commit 6cef5936a9cf9e004b6940edfaf57493558332b9
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 00:52:25 2013 +0200

    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 at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 27b3c07..111d3b5 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 48d7842..a141b65 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
similarity index 100%
rename from afms/ExternalPackage_fontunxafm.mk
rename to external/afms/ExternalPackage_fontunxafm.mk
diff --git a/afms/Makefile b/external/afms/Makefile
similarity index 100%
rename from afms/Makefile
rename to external/afms/Makefile
diff --git a/afms/Module_afms.mk b/external/afms/Module_afms.mk
similarity index 100%
rename from afms/Module_afms.mk
rename to external/afms/Module_afms.mk
diff --git a/afms/README b/external/afms/README
similarity index 100%
rename from afms/README
rename to external/afms/README
diff --git a/afms/UnpackedTarball_afms.mk b/external/afms/UnpackedTarball_afms.mk
similarity index 100%
rename from afms/UnpackedTarball_afms.mk
rename to external/afms/UnpackedTarball_afms.mk