8 files changed, 92 insertions, 69 deletions
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