Sat Feb 9 11:08:15 UTC 2019

Module_ooo.mk                                 |    1 
 Repository.mk                                 |    3 +
 RepositoryExternal.mk                         |   31 ++++++++++++
 RepositoryFixes.mk                            |    5 ++
 postprocess/packcomponents/makefile.mk        |    2 
 python/makefile.mk                            |    9 ++-
 python/prj/d.lst                              |    1 
 python/pyversion.mk                           |   20 ++++----
 python/pyversion_dmake.mk                     |   46 ++++++++++++++++++
 pyuno/Executable_pyuno_python_exe.mk          |   63 ++++++++++++++++++++++++++
 pyuno/Library_pythonloader.mk                 |   53 +++++++++++++++++++++
 pyuno/Library_pyuno.mk                        |   58 +++++++++++++++++++++++
 pyuno/Library_pyuno_loader.mk                 |   39 ++++++++++++++++
 pyuno/Makefile                                |   32 +++++++++++++
 pyuno/Module_pyuno.mk                         |   60 ++++++++++++++++++++++++
 pyuno/Package_py.mk                           |   36 ++++++++++++++
 pyuno/Package_python_bin.mk                   |   31 ++++++++++++
 pyuno/Package_pyuno_ini.mk                    |   31 ++++++++++++
 pyuno/Package_pyuno_python_sh.mk              |   33 +++++++++++++
 pyuno/Package_zipcore.mk                      |   61 +++++++++++++++++++++++++
 pyuno/demo/makefile.mk                        |    2 
 pyuno/inc/pyuno/pyuno.hxx                     |    6 --
 pyuno/prj/build.lst                           |    5 --
 pyuno/prj/d.lst                               |   26 ----------
 pyuno/prj/makefile.mk                         |   44 ++++++++++++++++++
 pyuno/source/loader/pyuno_loader.cxx          |    4 -
 pyuno/source/module/pyuno_dlopenwrapper.c     |    2 
 scp2/source/python/makefile.mk                |    2 
 testtools/source/bridgetest/pyuno/makefile.mk |    2 
 29 files changed, 654 insertions(+), 54 deletions(-)

New commits:
commit 862cae200004e79034278292d0df6eba5e343cef
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Feb 9 09:12:01 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Feb 9 09:12:01 2019 +0000

    Port main/pyuno to gbuild.
    
    Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index e46e15024625..ac0723ea1c6a 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     package \
     padmin \
     psprint_config \
+    pyuno \
     rdbmaker \
     registry \
     remotebridges \
diff --git a/Repository.mk b/Repository.mk
index 93cb75765037..3a33d0f9f112 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -143,6 +143,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     odbcbase \
     oox \
     package2 \
+    pyuno \
+    pyuno_loader \
     qstart_gtk \
     rpt \
     rptui \
@@ -269,6 +271,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     lnth \
     nullcanvas \
     passwordcontainer \
+    pythonloader \
     simplecanvas \
     slideshow \
     spell \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 20c2367713bd..0caff731240c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -702,4 +702,35 @@ endef
 
 endif # SYSTEM_HUNSPELL
 
+
+
+ifeq ($(SYSTEM_PYTHON),YES)
+
+define gb_LinkTarget__use_python
+$(call gb_LinkTarget_set_include,$(1),\
+        $$(INCLUDE) \
+        $(filter -I%,$(PYTHON_CFLAGS)) \
+)
+$(call gb_LinkTarget_add_defs,$(1),\
+        $(filter-out -I%,$(PYTHON_CFLAGS)) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+        $(PYTHON_LIBS) \
+)
+endef
+
+else # !SYSTEM_PYTHON
+
+include $(SRCDIR)/python/pyversion.mk
+
+define gb_LinkTarget__use_python
+$(call gb_LinkTarget_set_include,$(1),\
+        $$(INCLUDE) \
+        -I$(OUTDIR)/inc/python \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(PYTHONLIB))
+endef
+
+endif # SYSTEM_PYTHON
+
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6d1364d1de67..dfba644246b7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -33,6 +33,7 @@ gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyph
 gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
@@ -52,6 +53,7 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
 gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
@@ -68,6 +70,8 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
 gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+# pyuno.so even on Mac OS X, because it is a python module
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
@@ -251,6 +255,7 @@ gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 95d4da7e5487..484ca4875538 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -96,6 +96,7 @@ my_components = \
     component/oox/util/oox \
     component/package/source/xstor/xstor \
     component/package/util/package2 \
+    component/pyuno/source/loader/pythonloader \
     component/reportdesign/util/rptxml \
     component/reportdesign/util/rpt \
     component/reportdesign/util/rptui \
@@ -175,7 +176,6 @@ my_components = \
     placeware \
     preload \
     protocolhandler \
-    pythonloader \
     pythonscript \
     res \
     scn \
diff --git a/python/makefile.mk b/python/makefile.mk
index ae1029e36190..ab492e448d30 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -29,7 +29,7 @@ TARGET=so_python
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-.INCLUDE :      pyversion.mk
+.INCLUDE :      pyversion_dmake.mk
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 all:
@@ -137,6 +137,7 @@ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|x6
 .ENDIF
 .ENDIF
 
+PYVERSIONFILE_DMAKE=$(MISC)$/pyversion_dmake.mk
 PYVERSIONFILE=$(MISC)$/pyversion.mk
 
 # --- Targets ------------------------------------------------------
@@ -160,10 +161,14 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h
 .ENDIF
 .ENDIF
 
-ALLTAR : $(PYVERSIONFILE)
+ALLTAR : $(PYVERSIONFILE_DMAKE) $(PYVERSIONFILE)
 .ENDIF          # "$(L10N_framework)"==""
 
 
+$(PYVERSIONFILE_DMAKE) : pyversion_dmake.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    -rm -f $@
+    cat $? > $@
+
 $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
     -rm -f $@
     cat $? > $@
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 231cd00282f9..50423e3c1b01 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -75,6 +75,7 @@ mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 ..\%__SRC%\misc\build\Python-2.7.15\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
 ..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
 ..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
+..\pyversion_dmake.mk %_DEST%\inc%_EXT%\pyversion_dmake.mk
 
 ..\%__SRC%\misc\build\Python-2.7.15\Include\* %_DEST%\inc%_EXT%\python\*
 
diff --git a/python/pyversion.mk b/python/pyversion.mk
index 7cc0c1461ac1..8fc7fc9bb922 100644
--- a/python/pyversion.mk
+++ b/python/pyversion.mk
@@ -25,22 +25,22 @@ PYMINOR=7
 PYMICRO=15
 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 
-.IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "MACOSX"
+ifeq ($(GUI),UNX)
+ifeq ($(OS),MACOSX)
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib
-.ELSE
+else
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
-.ENDIF
+endif
 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
-.ELIF "$(GUI)" == "OS2"
+else ifeq ($(GUI),OS2)
 PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
 PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
-.ELSE
-.IF "$(COM)" == "GCC"
+else
+ifeq ($(COM),GCC)
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll
 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
-.ELSE
+else
 PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
 PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
-.ENDIF
-.ENDIF
+endif
+endif
diff --git a/python/pyversion_dmake.mk b/python/pyversion_dmake.mk
new file mode 100644
index 000000000000..7cc0c1461ac1
--- /dev/null
+++ b/python/pyversion_dmake.mk
@@ -0,0 +1,46 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
+# when you want to change the python version, you must update the d.lst
+# in the python project accordingly !!!
+PYMAJOR=2
+PYMINOR=7
+PYMICRO=15
+PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
+
+.IF "$(GUI)" == "UNX"
+.IF "$(OS)" == "MACOSX"
+PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib
+.ELSE
+PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
+.ENDIF
+PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
+.ELIF "$(GUI)" == "OS2"
+PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
+PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
+.ELSE
+.IF "$(COM)" == "GCC"
+PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll
+PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
+.ELSE
+PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
+PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
+.ENDIF
+.ENDIF
diff --git a/pyuno/Executable_pyuno_python_exe.mk b/pyuno/Executable_pyuno_python_exe.mk
new file mode 100644
index 000000000000..8087e5a18204
--- /dev/null
+++ b/pyuno/Executable_pyuno_python_exe.mk
@@ -0,0 +1,63 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+include $(SRCDIR)/python/pyversion.mk
+
+$(eval $(call gb_Executable_Executable,pyuno_python_exe))
+
+$(eval $(call gb_Executable_set_include,pyuno_python_exe,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/CustomTarget/pyuno/zipcore \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,pyuno_python_exe,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,pyuno_python_exe,\
+	user32 \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,pyuno_python_exe,\
+	ooopathutils \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,pyuno_python_exe,\
+	pyuno/zipcore/python \
+))
+
+# Automatic dependency resolution fails; add it ourselves:
+$(SRCDIR)/pyuno/zipcore/python.cxx : $(WORKDIR)/CustomTarget/pyuno/zipcore/pyversion.hxx
+
+$(WORKDIR)/CustomTarget/pyuno/zipcore/pyversion.hxx : $(SRCDIR)/pyuno/zipcore/pyversion.inc
+	mkdir -p $(dir $@) && \
+	sed "s/@/$(PYVERSION)/g" < $< > $@
+
+
+
+# FIXME: cannot specify custom executable path, so must build a wrongly named EXE and then re-deliver it to a different directory!
+$(eval $(call gb_Package_Package,pyuno_python_exe,$(OUTDIR)))
+$(eval $(call gb_Package_add_file,pyuno_python_exe,bin/pyuno/python.exe,bin/pyuno_python_exe.exe))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Library_pythonloader.mk b/pyuno/Library_pythonloader.mk
new file mode 100644
index 000000000000..a7aeaea5e76a
--- /dev/null
+++ b/pyuno/Library_pythonloader.mk
@@ -0,0 +1,53 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,pythonloader))
+
+$(eval $(call gb_Library_set_componentfile,pythonloader,pyuno/source/loader/pythonloader))
+
+$(eval $(call gb_Library_set_include,pythonloader,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/pyuno/inc \
+))
+
+$(eval $(call gb_Library_add_api,pythonloader, \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,pythonloader,\
+	cppu \
+	cppuhelper \
+	pyuno \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_external,pythonloader,python)
+
+$(eval $(call gb_Library_add_exception_objects,pythonloader,\
+	pyuno/source/loader/pyuno_loader \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/pyuno/Library_pyuno.mk b/pyuno/Library_pyuno.mk
new file mode 100644
index 000000000000..4a211c69aa3a
--- /dev/null
+++ b/pyuno/Library_pyuno.mk
@@ -0,0 +1,58 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,pyuno))
+
+$(eval $(call gb_Library_set_include,pyuno,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/pyuno/inc \
+))
+
+$(eval $(call gb_Library_add_api,pyuno, \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,pyuno,\
+	cppu \
+	cppuhelper \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_external,pyuno,python)
+
+$(eval $(call gb_Library_add_exception_objects,pyuno,\
+	pyuno/source/module/pyuno_runtime \
+	pyuno/source/module/pyuno \
+	pyuno/source/module/pyuno_callable \
+	pyuno/source/module/pyuno_module \
+	pyuno/source/module/pyuno_type \
+	pyuno/source/module/pyuno_util \
+	pyuno/source/module/pyuno_except \
+	pyuno/source/module/pyuno_adapter \
+	pyuno/source/module/pyuno_gc \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/pyuno/Library_pyuno_loader.mk b/pyuno/Library_pyuno_loader.mk
new file mode 100644
index 000000000000..c48c4bf61215
--- /dev/null
+++ b/pyuno/Library_pyuno_loader.mk
@@ -0,0 +1,39 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+# Name is changd to pyuno.so on all *nix systems in main/RepositoryFixes.mk
+# python expects modules without the lib prefix 
+
+$(eval $(call gb_Library_Library,pyuno_loader))
+
+$(eval $(call gb_Library_set_include,pyuno_loader,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/pyuno/inc \
+))
+
+$(eval $(call gb_Library_add_cobjects,pyuno_loader,\
+	pyuno/source/module/pyuno_dlopenwrapper \
+))
+
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/pyuno/Makefile b/pyuno/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/pyuno/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
new file mode 100644
index 000000000000..bb4620ef219c
--- /dev/null
+++ b/pyuno/Module_pyuno.mk
@@ -0,0 +1,60 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,pyuno))
+
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Library_pyuno \
+	Library_pythonloader \
+	Package_py \
+	Package_pyuno_ini \
+))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Library_pyuno_loader \
+))
+endif
+
+ifneq ($(SYSTEM_PYTHON),YES)
+ifneq ($(GUI),OS2)
+
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Package_zipcore \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Executable_pyuno_python_exe \
+))
+else ifeq ($(GUI),UNX)
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Package_python_bin \
+	Package_pyuno_python_sh \
+))
+endif
+
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Package_py.mk b/pyuno/Package_py.mk
new file mode 100644
index 000000000000..1c954454e515
--- /dev/null
+++ b/pyuno/Package_py.mk
@@ -0,0 +1,36 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+$(eval $(call gb_Package_Package,pyuno_py,$(SRCDIR)/pyuno))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Package_add_file,pyuno_py,bin/pyuno/pythonloader.py,source/loader/pythonloader.py))
+$(eval $(call gb_Package_add_file,pyuno_py,bin/pyuno/uno.py,source/module/uno.py))
+$(eval $(call gb_Package_add_file,pyuno_py,bin/pyuno/unohelper.py,source/module/unohelper.py))
+else ifeq ($(GUI),OS2)
+$(eval $(call gb_Package_add_file,pyuno_py,bin/pyuno/pythonloader.py,source/loader/pythonloader.py))
+$(eval $(call gb_Package_add_file,pyuno_py,bin/pyuno/uno.py,source/module/uno.py))
+$(eval $(call gb_Package_add_file,pyuno_py,bin/pyuno/unohelper.py,source/module/unohelper.py))
+else
+$(eval $(call gb_Package_add_file,pyuno_py,lib/pyuno/pythonloader.py,source/loader/pythonloader.py))
+$(eval $(call gb_Package_add_file,pyuno_py,lib/pyuno/uno.py,source/module/uno.py))
+$(eval $(call gb_Package_add_file,pyuno_py,lib/pyuno/unohelper.py,source/module/unohelper.py))
+endif
diff --git a/pyuno/Package_python_bin.mk b/pyuno/Package_python_bin.mk
new file mode 100644
index 000000000000..852e21429fea
--- /dev/null
+++ b/pyuno/Package_python_bin.mk
@@ -0,0 +1,31 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+$(eval $(call gb_Package_Package,pyuno_python_bin,$(WORKDIR)/CustomTarget/pyuno/zipcore))
+
+$(eval $(call gb_Package_add_file,pyuno_python_bin,bin/python.bin,python.bin))
+
+$(WORKDIR)/CustomTarget/pyuno/zipcore/python.bin : $(OUTDIR)/bin/python
+	mkdir -p $(dir $@) && \
+	cp $^ $@ && \
+	$(if $(filter-out MACOSX,$(OS)),strip $@ &&) \
+	chmod +x $@
+
diff --git a/pyuno/Package_pyuno_ini.mk b/pyuno/Package_pyuno_ini.mk
new file mode 100644
index 000000000000..28714ff49fbc
--- /dev/null
+++ b/pyuno/Package_pyuno_ini.mk
@@ -0,0 +1,31 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,pyuno_pyuno_ini,$(SRCDIR)/pyuno))
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Package_add_file,pyuno_pyuno_ini,lib/pyunorc,source/module/pyuno))
+else ifeq ($(GUI),OS2)
+$(eval $(call gb_Package_add_file,pyuno_pyuno_ini,bin/pyuno.ini,source/module/pyuno))
+else
+$(eval $(call gb_Package_add_file,pyuno_pyuno_ini,bin/pyuno.ini,source/module/pyuno))
+endif
diff --git a/pyuno/Package_pyuno_python_sh.mk b/pyuno/Package_pyuno_python_sh.mk
new file mode 100644
index 000000000000..bcdd6a349a4a
--- /dev/null
+++ b/pyuno/Package_pyuno_python_sh.mk
@@ -0,0 +1,33 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+include $(SRCDIR)/python/pyversion.mk
+
+$(eval $(call gb_Package_Package,pyuno_python_sh,$(WORKDIR)/CustomTarget/pyuno/zipcore))
+
+$(eval $(call gb_Package_add_file,pyuno_python_sh,bin/pyuno/python,python.sh))
+
+$(WORKDIR)/CustomTarget/pyuno/zipcore/python.sh : $(SRCDIR)/pyuno/zipcore/python.sh
+	mkdir -p $(dir $@) && \
+	sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $< > $@ && \
+	chmod +x $@
+
+
diff --git a/pyuno/Package_zipcore.mk b/pyuno/Package_zipcore.mk
new file mode 100644
index 000000000000..367401dd47e1
--- /dev/null
+++ b/pyuno/Package_zipcore.mk
@@ -0,0 +1,61 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+include $(SRCDIR)/python/pyversion.mk
+
+$(eval $(call gb_Package_Package,pyuno_zipcore,$(WORKDIR)/CustomTarget/pyuno/zipcore))
+
+$(eval $(call gb_Package_add_file,pyuno_zipcore,bin/python-core-$(PYVERSION).zip,python-core-$(PYVERSION).zip))
+
+
+
+ifneq ($(GUI),UNX)
+ifeq ($(COM),GCC)
+PYTHONBINARY := $(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION)/bin/python.bin
+else
+PYTHONBINARY := $(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION)/bin/python$(gb_Executable_EXT)
+endif
+endif
+
+PYTHON_CORE_FILES := $(PYTHONBINARY) \
+	$(foreach lib,$(shell find $(OUTDIR)/lib/python -type f | grep -v "\.pyc" | grep -v "\.py~" | grep -v .orig | grep -v _failed),$(subst $(OUTDIR)/lib/python,$(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION)/lib,$(lib))) \
+	$(foreach inc,$(shell find $(OUTDIR)/inc/python -type f | grep -v "\.h~" | grep -v _failed),$(subst $(OUTDIR)/inc/python,$(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION)/include/python$(PYMAJOR).$(PYMINOR),$(inc)))
+
+$(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION).zip : $(PYTHON_CORE_FILES)
+	mkdir -p $(dir $@) && \
+	cd $(dir $@) && \
+	$(if $(filter-out MACOSX,$(OS)),$(if $(filter UNX,$(GUI)),find . -name "*$(gb_Library_PLAINEXT)" | xargs strip &&)) \
+	zip -r python-core-$(PYVERSION).zip python-core-$(PYVERSION)
+
+ifneq ($(GUI),UNX)
+$(PYTHONBINARY) : $(OUTDIR)/bin/python$(gb_Executable_EXT)
+	mkdir -p $(dir $@) && \
+	cp $< $@
+endif
+
+$(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION)/lib/% : $(OUTDIR)/lib/python/%
+	mkdir -p $(dir $@) && \
+	cp $< $@
+
+$(WORKDIR)/CustomTarget/pyuno/zipcore/python-core-$(PYVERSION)/include/python$(PYMAJOR).$(PYMINOR)/% : $(OUTDIR)/inc/python/%
+	mkdir -p $(dir $@) && \
+	cp $< $@
+	
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk
index b866189ce01d..379347ed8221 100644
--- a/pyuno/demo/makefile.mk
+++ b/pyuno/demo/makefile.mk
@@ -22,7 +22,7 @@ PRJNAME=pyuno
 PRJ=..
 
 .INCLUDE : settings.mk
-.INCLUDE : pyversion.mk
+.INCLUDE : pyversion_dmake.mk
 
 ROOT=$(MISC)$/pyuno-doc
 
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index cd463ff96156..778720b8892a 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -68,11 +68,7 @@
    to do the necessary conversions.
 */
 
-#ifdef WIN32
-#define PY_DLLEXPORT __declspec(dllexport)
-#else
-#define PY_DLLEXPORT
-#endif
+#define PY_DLLEXPORT SAL_DLLPUBLIC_EXPORT
 
 /** function called by the python runtime to initialize the
     pyuno module.
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index 5a3b2c179e7d..00ed74cef971 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,5 +1,2 @@
 bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
-pu	pyuno				  usr1	-	all	br_mkout NULL
-pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
-pu	pyuno\source\module	nmake	-	all	pu_module NULL
-pu	pyuno\source\loader	nmake	-	all	pu_loader pu_module NULL
+pu	pyuno\prj	nmake	-	all	pu_prj NULL
diff --git a/pyuno/prj/d.lst b/pyuno/prj/d.lst
index 1dd212ea9cf4..e69de29bb2d1 100644
--- a/pyuno/prj/d.lst
+++ b/pyuno/prj/d.lst
@@ -1,26 +0,0 @@
-mkdir: %_DEST%\bin%_EXT%\pyuno
-mkdir: %_DEST%\lib%_EXT%\pyuno
-
-..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
-..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
-..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
-..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
-..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
-..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\pyuno\unohelper.py
-..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\pyuno\uno.py
-..\%__SRC%\misc\pythonloader.component %_DEST%\xml\pythonloader.component
-
-..\%__SRC%\bin\unohelper.py %_DEST%\bin%_EXT%\pyuno\unohelper.py
-..\%__SRC%\bin\pythonloader.py %_DEST%\bin%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\bin\uno.py %_DEST%\bin%_EXT%\pyuno\uno.py
-..\%__SRC%\bin\pyuno.pyd %_DEST%\bin%_EXT%\pyuno.pyd
-..\%__SRC%\bin\pyuno.dll %_DEST%\bin%_EXT%\pyuno.dll
-..\%__SRC%\bin\pythonl*.dll %_DEST%\bin%_EXT%\pythonl*.dll
-
-..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
-..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
-..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
-..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\pyuno\python
-..\%__SRC%\bin\python.exe %_DEST%\bin%_EXT%\pyuno\python.exe
diff --git a/pyuno/prj/makefile.mk b/pyuno/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/pyuno/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index f0f0752300d1..7e487c590e11 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -219,13 +219,13 @@ extern "C"
 {
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c
index 86971f2fdb4a..d6de4ac181ff 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -33,7 +33,7 @@
 #endif
 #include <dlfcn.h>
 
-void initpyuno ()
+SAL_DLLPUBLIC_EXPORT void initpyuno ()
 {
     Dl_info dl_info;
     void (*func)(void);
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index 896a806735b7..ffb3e41c4dbf 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -36,7 +36,7 @@ TARGETTYPE=CUI
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ELSE
-.INCLUDE :      pyversion.mk
+.INCLUDE :      pyversion_dmake.mk
 .ENDIF
 
 SCPDEFS+=\
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index 18747e2f5c07..e1f454ffba07 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -29,7 +29,7 @@ LIBTARGET=NO
 TARGETTYPE=CUI
 ENABLE_EXCEPTIONS=TRUE
 
-my_components = pythonloader
+my_components = component/pyuno/source/loader/pythonloader
 
 # --- Settings -----------------------------------------------------
 
