fdo#70393: move epm to a subdir of external

Change-Id: Ifa10b01d9dce947a0153b9d3e1399d9842ba6241
Reviewed-on: https://gerrit.libreoffice.org/6299Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

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 \

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) \
 ))

epm/Module_epm.mk → 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:

epm/UnpackedTarball_epm.mk → 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: