From fd7cf77ad5e353d4332ed65dfa4252c841cd85f7 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 3 Mar 2014 22:47:30 +0100 Subject: pyuno: rename Executable_python_wrapper.mk Change-Id: I653cb0e36c1faa622ecc90e0316a1f1fd1e843db --- pyuno/Executable_python.mk | 24 ++++++++++++++++++++++++ pyuno/Executable_python_wrapper.mk | 24 ------------------------ pyuno/Module_pyuno.mk | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 pyuno/Executable_python.mk delete mode 100644 pyuno/Executable_python_wrapper.mk (limited to 'pyuno') diff --git a/pyuno/Executable_python.mk b/pyuno/Executable_python.mk new file mode 100644 index 000000000000..2f96404b7ae2 --- /dev/null +++ b/pyuno/Executable_python.mk @@ -0,0 +1,24 @@ +# -*- 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_Executable_Executable,python)) + +$(eval $(call gb_Executable_add_defs,python,\ + -DMY_PYVERSION=L\"$(PYTHON_VERSION)\" \ +)) + +$(eval $(call gb_Executable_use_static_libraries,python,\ + ooopathutils \ +)) + +$(eval $(call gb_Executable_add_exception_objects,python,\ + pyuno/zipcore/python \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python_wrapper.mk deleted file mode 100644 index 2f96404b7ae2..000000000000 --- a/pyuno/Executable_python_wrapper.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- 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_Executable_Executable,python)) - -$(eval $(call gb_Executable_add_defs,python,\ - -DMY_PYVERSION=L\"$(PYTHON_VERSION)\" \ -)) - -$(eval $(call gb_Executable_use_static_libraries,python,\ - ooopathutils \ -)) - -$(eval $(call gb_Executable_add_exception_objects,python,\ - pyuno/zipcore/python \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index b79c21d458b9..9a079938f162 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -33,7 +33,7 @@ endif # zipcore: pyuno/python.exe on Windows ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,pyuno,\ - Executable_python_wrapper \ + Executable_python \ )) endif -- cgit