15 files changed, 101 insertions, 78 deletions
diff --git a/Makefile.top b/Makefile.top
index 7949b1244dde..87653e1a9c18 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -72,6 +72,7 @@ dtrans\
 editeng\
 embeddedobj\
 embedserv\
+epm\
 eventattacher\
 expat\
 extensions\
@@ -213,7 +214,6 @@ cairo\
 cppunit\
 crashrep\
 curl\
-epm\
 external\
 gdk-pixbuf\
 gettext\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index d9a3ed4712c9..7cafb1c8078d 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	editeng \
 	embeddedobj \
 	embedserv \
+	$(call gb_Helper_optional,EPM,epm) \
 	eventattacher \
 	extensions \
 	extras \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 6af9bb04b839..226aa55d71a9 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	editeng \
 	embeddedobj \
 	embedserv \
+	$(call gb_Helper_optional,EPM,epm) \
 	eventattacher \
 	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
diff --git a/config_host.mk.in b/config_host.mk.in
index fdf1619322c0..064eece174b3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -38,7 +38,6 @@ export BOOST_TARBALL=@BOOST_TARBALL@
 export BSH_JAR=@BSH_JAR@
 export BSH_TARBALL=@BSH_TARBALL@
 export BUILD_DMAKE=@BUILD_DMAKE@
-export BUILD_EPM=@BUILD_EPM@
 export BUILD_MOZAB=@BUILD_MOZAB@
 export BUILD_NCPUS=@BUILD_NCPUS@
 export BUILD_PLATFORM=@build@
@@ -180,6 +179,7 @@ export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
 export ENABLE_ZENITY=@ENABLE_ZENITY@
 export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
+export EPM_TARBALL=@EPM_TARBALL@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
 @x_Cygwin@ export FIND=@WIN_FIND@
 export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
diff --git a/configure.ac b/configure.ac
index 019357cec40f..f25debb2787f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6563,7 +6563,6 @@ dnl ===================================================================
 dnl Check for epm (not needed for Windows)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable EPM for packing])
-BUILD_EPM=NO
 if test "$enable_epm" = "yes"; then
     AC_MSG_RESULT([yes])
     if test "$_os" != "WINNT"; then
@@ -6574,7 +6573,7 @@ if test "$enable_epm" = "yes"; then
         fi
         if test "$EPM" = "no" -o "$EPM" = "internal"; then
             echo "EPM will be built."
-            BUILD_EPM=YES
+            EPM_TARBALL="3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
             BUILD_TYPE="$BUILD_TYPE EPM"
         else
             # Gentoo has some epm which is something different...
@@ -6589,7 +6588,6 @@ if test "$enable_epm" = "yes"; then
             if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
                test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
                 AC_MSG_RESULT([OK, >= 3.7])
-                BUILD_EPM=NO
                 if test "$_os" = "Darwin"; then
                     AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
                     _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
@@ -6604,7 +6602,7 @@ if test "$enable_epm" = "yes"; then
             else
                 AC_MSG_RESULT([too old. epm >= 3.7 is required.])
                 echo "EPM will be built."
-                BUILD_EPM=YES
+                EPM_TARBALL="3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
                 BUILD_TYPE="$BUILD_TYPE EPM"
             fi
         fi
@@ -6692,7 +6690,7 @@ else
     EPM=NO
 fi
 AC_SUBST(EPM)
-AC_SUBST(BUILD_EPM)
+AC_SUBST(EPM_TARBALL)
 
 dnl ===================================================================
 dnl We need winegcc when building MinGW build to be able to cross-build msi tools
diff --git a/epm/ExternalPackage_epm.mk b/epm/ExternalPackage_epm.mk
new file mode 100644
index 000000000000..793f4192b787
--- /dev/null
+++ b/epm/ExternalPackage_epm.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,epm,epm))
+
+$(eval $(call gb_ExternalPackage_use_external_project,epm,epm))
+
+$(eval $(call gb_ExternalPackage_add_files,epm,bin,\
+	epm \
+	epminstall \
+	mkepmlist \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk
new file mode 100644
index 000000000000..7229942dbe73
--- /dev/null
+++ b/epm/ExternalProject_epm.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,epm))
+
+$(eval $(call gb_ExternalProject_use_unpacked,epm,epm))
+
+$(eval $(call gb_ExternalProject_register_targets,epm,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,epm,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure --disable-fltk \
+		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
+	&& $(GNUMAKE) \
+	&& touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/Makefile b/epm/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/epm/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/Module_epm.mk b/epm/Module_epm.mk
new file mode 100644
index 000000000000..8a522727b384
--- /dev/null
+++ b/epm/Module_epm.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,epm))
+
+ifeq (EPM,$(filter EPM,$(BUILD_TYPE)))
+
+$(eval $(call gb_Module_add_targets,epm,\
+	ExternalPackage_epm \
+	ExternalProject_epm \
+	UnpackedTarball_epm \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/UnpackedTarball_epm.mk b/epm/UnpackedTarball_epm.mk
new file mode 100644
index 000000000000..b9e7e3bcce1a
--- /dev/null
+++ b/epm/UnpackedTarball_epm.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,epm))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,epm,\
+	epm/epm-3.7.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/makefile.mk b/epm/makefile.mk
deleted file mode 100644
index ebfcb979c804..000000000000
--- a/epm/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=epm
-TARGET=epm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=epm-3.7
-TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4
-PATCH_FILES=epm-3.7.patch
-
-.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" && "$(CROSS_COMPILING)" != "YES"
-
-EXTRPATH = NONE
-
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-fltk
-.IF "$(OS)"=="MACOSX"
-CONFIGURE_FLAGS += \
-    --prefix=/@.__________________________________________________$(EXTRPATH)
-.IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LINKFLAGS)" CPP="gcc -E $(EXTRA_CFLAGS)"
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF
-BUILD_ACTION=make
-OUT2BIN=epm epminstall mkepmlist
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/epm/prj/d.lst b/epm/prj/d.lst
index 315d3d175552..e69de29bb2d1 100644
--- a/epm/prj/d.lst
+++ b/epm/prj/d.lst
@@ -1,3 +0,0 @@
-..\%__SRC%\bin\epm %_DEST%\bin\epm
-..\%__SRC%\bin\epminstall %_DEST%\bin\epminstall
-..\%__SRC%\bin\mkepmlist %_DEST%\bin\mkepmlist
diff --git a/epm/prj/dmake b/epm/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/epm/prj/dmake
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index 6f23f85ee082..6fac4876d41e 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -9,7 +9,6 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
@@ -57,6 +56,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 @CDR_TARBALL@
 @CLUCENE_TARBALL@
 @CMIS_TARBALL@
+@EPM_TARBALL@
 @FONT_DEJAVU_TARBALL@
 @FONT_GENTIUM_TARBALL@
 @FONT_LIBERATION_NARROW_TARBALL@
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 3247ce95f5c0..7353c6c68060 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep EPM:epm HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL