summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/epm/ExternalPackage_epm.mk (renamed from epm/ExternalPackage_epm.mk)0
-rw-r--r--external/epm/ExternalProject_epm.mk (renamed from epm/ExternalProject_epm.mk)0
-rw-r--r--external/epm/Makefile (renamed from epm/Makefile)0
-rw-r--r--external/epm/Module_epm.mk (renamed from epm/Module_epm.mk)4
-rw-r--r--external/epm/README (renamed from epm/README)0
-rw-r--r--external/epm/UnpackedTarball_epm.mk (renamed from epm/UnpackedTarball_epm.mk)2
-rw-r--r--external/epm/epm-3.7.patch (renamed from epm/epm-3.7.patch)0
9 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 96091c1dc2fd..1d1e3788ab03 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 8d5232bcc9df..ec8e15b7598a 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
index 793f4192b787..793f4192b787 100644
--- a/epm/ExternalPackage_epm.mk
+++ b/external/epm/ExternalPackage_epm.mk
diff --git a/epm/ExternalProject_epm.mk b/external/epm/ExternalProject_epm.mk
index ca0c298509c6..ca0c298509c6 100644
--- a/epm/ExternalProject_epm.mk
+++ b/external/epm/ExternalProject_epm.mk
diff --git a/epm/Makefile b/external/epm/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/epm/Makefile
+++ b/external/epm/Makefile
diff --git a/epm/Module_epm.mk b/external/epm/Module_epm.mk
index 773342cb2819..f86455cb1f91 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
index c3ec2986e7d4..c3ec2986e7d4 100644
--- a/epm/README
+++ b/external/epm/README
diff --git a/epm/UnpackedTarball_epm.mk b/external/epm/UnpackedTarball_epm.mk
index 3902317264fa..922800b52142 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
index 869c141a7155..869c141a7155 100644
--- a/epm/epm-3.7.patch
+++ b/external/epm/epm-3.7.patch