[Libreoffice-commits] core.git: epm/epm-3.7.patch epm/ExternalPackage_epm.mk epm/ExternalProject_epm.mk epm/Makefile epm/Module_epm.mk epm/README epm/UnpackedTarball_epm.mk external/epm external/Module_external.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk            |    1 
 epm/ExternalPackage_epm.mk          |   20 -
 epm/ExternalProject_epm.mk          |   24 -
 epm/Makefile                        |    7 
 epm/Module_epm.mk                   |   26 -
 epm/README                          |    3 
 epm/UnpackedTarball_epm.mk          |   18 
 epm/epm-3.7.patch                   |  666 ------------------------------------
 external/Module_external.mk         |    1 
 external/epm/ExternalPackage_epm.mk |   20 +
 external/epm/ExternalProject_epm.mk |   24 +
 external/epm/Makefile               |    7 
 external/epm/Module_epm.mk          |   22 +
 external/epm/README                 |    3 
 external/epm/UnpackedTarball_epm.mk |   18 
 external/epm/epm-3.7.patch          |  666 ++++++++++++++++++++++++++++++++++++
 16 files changed, 761 insertions(+), 765 deletions(-)

New commits:
commit 86c32b4196d178955f6f9ef5254b6c6a1ee3c944
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 19:35:22 2013 +0200

    fdo#70393: move epm to a subdir of external
    
    Change-Id: Ifa10b01d9dce947a0153b9d3e1399d9842ba6241
    Reviewed-on: https://gerrit.libreoffice.org/6299
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 96091c1..1d1e378 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	editeng \
 	embeddedobj \
 	embedserv \
-	$(call gb_Helper_optional,EPM,epm) \
 	eventattacher \
 	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 8d5232b..ec8e15b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
 	$(call gb_Helper_optional,CT2N,ct2n) \
 	$(call gb_Helper_optional,CURL,curl) \
+	$(call gb_Helper_optional,EPM,epm) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/epm/ExternalPackage_epm.mk b/external/epm/ExternalPackage_epm.mk
similarity index 100%
rename from epm/ExternalPackage_epm.mk
rename to external/epm/ExternalPackage_epm.mk
diff --git a/epm/ExternalProject_epm.mk b/external/epm/ExternalProject_epm.mk
similarity index 100%
rename from epm/ExternalProject_epm.mk
rename to external/epm/ExternalProject_epm.mk
diff --git a/epm/Makefile b/external/epm/Makefile
similarity index 100%
rename from epm/Makefile
rename to external/epm/Makefile
diff --git a/epm/Module_epm.mk b/external/epm/Module_epm.mk
similarity index 91%
rename from epm/Module_epm.mk
rename to external/epm/Module_epm.mk
index 773342c..f86455c 100644
--- a/epm/Module_epm.mk
+++ b/external/epm/Module_epm.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Module_Module,epm))
 
-ifeq (EPM,$(filter EPM,$(BUILD_TYPE)))
-
 ifneq ($(CROSS_COMPILING),YES)
 
 $(eval $(call gb_Module_add_targets,epm,\
@@ -21,6 +19,4 @@ $(eval $(call gb_Module_add_targets,epm,\
 
 endif
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/epm/README b/external/epm/README
similarity index 100%
rename from epm/README
rename to external/epm/README
diff --git a/epm/UnpackedTarball_epm.mk b/external/epm/UnpackedTarball_epm.mk
similarity index 94%
rename from epm/UnpackedTarball_epm.mk
rename to external/epm/UnpackedTarball_epm.mk
index 3902317..922800b 100644
--- a/epm/UnpackedTarball_epm.mk
+++ b/external/epm/UnpackedTarball_epm.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,epm))
 $(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL),,epm))
 
 $(eval $(call gb_UnpackedTarball_add_patches,epm,\
-	epm/epm-3.7.patch \
+	external/epm/epm-3.7.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/epm/epm-3.7.patch b/external/epm/epm-3.7.patch
similarity index 100%
rename from epm/epm-3.7.patch
rename to external/epm/epm-3.7.patch