Enforce a "lib" prefix for UNO components for Android

This commit for the old build system. (Don't bother for components not
relevant for Android.)

The Android package installer (as invoked through "adb install", from
"ant debug install") silently ignores native libraries in app packages
(.apk files) whose names don't start with "lib" and end with ".so".

The package builder (as invoked through "ant debug") in the SDK gladly
includes also thusly named native libraries in the .apk, though. Yay
for consistency.

34 files changed, 44 insertions, 40 deletions

diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index def12dd53c49..bdcf6d105178 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -40,7 +40,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SLOFILES = $(SLO)$/testacquire.obj
 
-SHL1TARGET = testacquire.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testacquire.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index 9ac266f80ff5..1da99e46131c 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -47,7 +47,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SLOFILES = $(SLO)$/testequals.obj
 
-SHL1TARGET = testequals.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testequals.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index d4926e07307b..6e481b136b0f 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -45,13 +45,13 @@ ERROR -- missing platform
 DLLPRE = # no leading "lib" on .so files
 INCPRE += $(MISC)$/$(TARGET)$/inc
 
-SHL1TARGET = $(TARGET)_client.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_client.uno
 SHL1OBJS = $(SLO)$/testnativethreadpoolclient.obj
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(TARGET)_client
 
-SHL2TARGET = $(TARGET)_server.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_server.uno
 SHL2OBJS = $(SLO)$/testnativethreadpoolserver.obj
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2VERSIONMAP = version.map
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index e2eac0f7bf0c..eb33e5723581 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin\configmgr.uno.dll
-..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib\configmgr.uno.dylib
-..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib\configmgr.uno.so
+..\%__SRC%\bin\*.uno.dll %_DEST%\bin\*.uno.dll
+..\%__SRC%\lib\*.uno.dylib %_DEST%\lib\*.uno.dylib
+..\%__SRC%\lib\*.uno.so %_DEST%\lib\*.uno.so
 ..\%__SRC%\misc\configmgr.component %_DEST%\xml\configmgr.component
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
index 94747d9dd803..e75af0dde734 100755..100644
--- a/configmgr/source/makefile.mk
+++ b/configmgr/source/makefile.mk
@@ -76,7 +76,7 @@ SHL1STDLIBS = \
     $(SALHELPERLIB) \
     $(SALLIB) \
     $(XMLREADERLIB)
-SHL1TARGET = configmgr.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)configmgr.uno
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
diff --git a/cppcanvas/source/uno/makefile.mk b/cppcanvas/source/uno/makefile.mk
index 5e06f4f1c839..589728c19fe8 100644
--- a/cppcanvas/source/uno/makefile.mk
+++ b/cppcanvas/source/uno/makefile.mk
@@ -44,7 +44,7 @@ CDEFS+= -DVERBOSE
 
 SLOFILES =	$(SLO)$/uno_mtfrenderer.obj
 
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
 
 SHL1STDLIBS= $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CPPCANVASLIB) $(BASEGFXLIB)
 
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 02bb6296a165..7290ec42e956 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -60,7 +60,7 @@ SHL1IMPLIB = i$(SHL1TARGET)
 SHL1RPATH = NONE
 DEF1NAME = $(SHL1TARGET)
 
-SHL2TARGET = $(TARGET).uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET).uno
 SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
 SHL2USE_EXPORTS = name
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk
index ea476c57c0eb..3c7ed2b8362a 100644
--- a/io/source/TextInputStream/makefile.mk
+++ b/io/source/TextInputStream/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = textinstream.uno
+TARGET = $(ENFORCEDSHLPREFIX)textinstream.uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk
index 2c9d4eb2efbc..37c913cea18d 100644
--- a/io/source/TextOutputStream/makefile.mk
+++ b/io/source/TextOutputStream/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = textoutstream.uno
+TARGET = $(ENFORCEDSHLPREFIX)textoutstream.uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index bbc7ac6d3836..cfa6f5f54824 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = acceptor.uno
+TARGET = $(ENFORCEDSHLPREFIX)acceptor.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = acceptor
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index e3a67abe66ff..dbd0ff207b39 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = connector.uno
+TARGET = $(ENFORCEDSHLPREFIX)connector.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = connectr
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index 52dd0c492823..5a6c78a065da 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = streams.uno
+TARGET = $(ENFORCEDSHLPREFIX)streams.uno
 
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 4c779ccd1ad0..1760a88b5cb1 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=../..
 
 PRJNAME=pyuno
-TARGET=pythonloader.uno
+TARGET=$(ENFORCEDSHLPREFIX)pythonloader.uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
index edf5aa72c128..8e7e8f715cc7 100644
--- a/remotebridges/source/unourl_resolver/makefile.mk
+++ b/remotebridges/source/unourl_resolver/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=remotebridges
-TARGET = uuresolver.uno
+TARGET = $(ENFORCEDSHLPREFIX)uuresolver.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = uuresolver
 
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 64fc1af2feb0..9262ef654dff 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -58,7 +58,7 @@ SLOFILES=\
     $(SLO)$/services.obj
 
 SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
 
 SHL1LIBS=\
     $(SLB)$/pdfmisc.lib \
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index a085439a4db9..e1d15a51636a 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -99,7 +99,7 @@ SLOFILES=										\
 
 # --- Library -----------------------------------
 
-SHL1TARGET=		$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
 
 SHL1STDLIBS=	$(CPPUHELPERLIB)	\
                 $(CPPULIB)			\
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 52c92da19bbb..49b481a0498d 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -50,3 +50,7 @@ STDLIBCUIMT+=-llog -landroid -lgnustl_shared
 STDSHLGUIMT+=-llog -landroid -lgnustl_shared
 STDSHLCUIMT+=-llog -landroid -lgnustl_shared
 
+# All shared libraries we build must start with "lib" because
+# otherwise the Android package installer will not unpack them from
+# the .apk into the app's lib directory
+ENFORCEDSHLPREFIX=lib
diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk
index a546a8a761db..1f4b4a5694c1 100644
--- a/stoc/source/corereflection/makefile.mk
+++ b/stoc/source/corereflection/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = reflection.uno
+TARGET = $(ENFORCEDSHLPREFIX)reflection.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = corefl
 
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
index 60864eea2496..62bf365fc85e 100644
--- a/stoc/source/inspect/makefile.mk
+++ b/stoc/source/inspect/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = introspection.uno
+TARGET = $(ENFORCEDSHLPREFIX)introspection.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = insp
 
diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk
index 72eeea37c659..214873d2c7c3 100644
--- a/stoc/source/invocation/makefile.mk
+++ b/stoc/source/invocation/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = invocation.uno
+TARGET = $(ENFORCEDSHLPREFIX)invocation.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = inv
 
diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk
index 4c3450ac8c8d..49bbc1a76ac2 100644
--- a/stoc/source/invocation_adapterfactory/makefile.mk
+++ b/stoc/source/invocation_adapterfactory/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = invocadapt.uno
+TARGET = $(ENFORCEDSHLPREFIX)invocadapt.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = invadp
 
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk
index e53b90d5e6e7..1df3b6cf00fd 100644
--- a/stoc/source/javaloader/makefile.mk
+++ b/stoc/source/javaloader/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = javaloader.uno
+TARGET = $(ENFORCEDSHLPREFIX)javaloader.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = javaloader
 
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
index bcd36e69681e..6c38f601cf58 100644
--- a/stoc/source/javavm/makefile.mk
+++ b/stoc/source/javavm/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = javavm.uno
+TARGET = $(ENFORCEDSHLPREFIX)javavm.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = jen
 
diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk
index cc98cdfc3571..149874cb3c82 100644
--- a/stoc/source/namingservice/makefile.mk
+++ b/stoc/source/namingservice/makefile.mk
@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = namingservice.uno
+TARGET = $(ENFORCEDSHLPREFIX)namingservice.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = namingservice
 
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk
index 23146e678f5a..0a8a92397e18 100644
--- a/stoc/source/proxy_factory/makefile.mk
+++ b/stoc/source/proxy_factory/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = proxyfac.uno
+TARGET = $(ENFORCEDSHLPREFIX)proxyfac.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = proxyfac
 
diff --git a/stoc/test/registry_tdprovider/makefile.mk b/stoc/test/registry_tdprovider/makefile.mk
index f258963f9299..f4d5d7be984c 100644
--- a/stoc/test/registry_tdprovider/makefile.mk
+++ b/stoc/test/registry_tdprovider/makefile.mk
@@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SLOFILES = $(SLO)$/testregistrytdprovider.obj
 
-SHL1TARGET = testregistrytdprovider.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testregistrytdprovider.uno
 SHL1OBJS = $(SLOFILES)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk
index 8f39ac552038..488378f63b0d 100644
--- a/stoc/test/tdmanager/makefile.mk
+++ b/stoc/test/tdmanager/makefile.mk
@@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SLOFILES = $(SLO)$/testtdmanager.obj
 
-SHL1TARGET = testtdmanager.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testtdmanager.uno
 SHL1OBJS = $(SLOFILES)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk
index 32f229cc3d14..8f58e0998bb2 100644
--- a/stoc/util/makefile.mk
+++ b/stoc/util/makefile.mk
@@ -37,7 +37,7 @@ DLLPRE =
 
 # ------------------------------------------------------------------
 
-SHL1TARGET=	$(TARGET)
+SHL1TARGET=	$(ENFORCEDSHLPREFIX)$(TARGET)
 
 LIB1TARGET=	$(SLB)$/$(TARGET).lib
 LIB1FILES=	$(SLB)$/bootstrap.lib \
@@ -68,7 +68,7 @@ SHL1RPATH=  URELIB
 
 DEF1NAME=	$(SHL1TARGET)
 
-SHL2TARGET=	stocservices.uno
+SHL2TARGET=	$(ENFORCEDSHLPREFIX)stocservices.uno
 
 LIB2TARGET=	$(SLB)$/stocservices.uno.lib
 LIB2FILES=	\
diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk
index 3e5fd43df7d4..a8c7cb3a45d2 100644
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ b/testtools/source/bridgetest/cli/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..$/..
 
 PRJNAME=testtools
-TARGET=cli_cpp_bridgetest.uno
+TARGET=$(ENFORCEDSHLPREFIX)cli_cpp_bridgetest.uno
 USE_DEFFILE=TRUE
 NO_BSYMBOLIC=TRUE
 ENABLE_EXCEPTIONS=TRUE
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 31c5b7e3dff3..a798b5090614 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -79,7 +79,7 @@ LIB1TARGET=$(SLB)$/cppobj.lib
 LIB1OBJFILES= \
         $(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
 
-SHL1TARGET = cppobj.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)cppobj.uno
 SHL1STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
@@ -98,7 +98,7 @@ LIB2OBJFILES= \
         $(SLO)$/currentcontextchecker.obj \
         $(SLO)$/multi.obj
 
-SHL2TARGET = bridgetest.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)bridgetest.uno
 SHL2STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
@@ -109,7 +109,7 @@ SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=	$(SHL2TARGET)
 SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 
-SHL3TARGET = constructors.uno
+SHL3TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)constructors.uno
 SHL3OBJS = $(SLO)$/constructors.obj
 SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL3VERSIONMAP = $(SOLARENV)/src/component.map
diff --git a/testtools/source/performance/makefile.mk b/testtools/source/performance/makefile.mk
index a4b179b05634..a7f2d6b71f2c 100644
--- a/testtools/source/performance/makefile.mk
+++ b/testtools/source/performance/makefile.mk
@@ -43,7 +43,7 @@ LIB1TARGET=$(SLB)$/perftest.lib
 LIB1OBJFILES= \
         $(SLO)$/ubtest.obj
 
-SHL1TARGET = perftest.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)perftest.uno
 
 SHL1VERSIONMAP = $(SOLARENV)$/src$/component.map
 
@@ -62,7 +62,7 @@ LIB2TARGET=$(SLB)$/perfobj.lib
 LIB2OBJFILES= \
         $(SLO)$/ubobject.obj
 
-SHL2TARGET = perfobj.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)perfobj.uno
 
 SHL2VERSIONMAP = $(SOLARENV)$/src$/component.map
 
diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk
index 70e441171a44..9182517da731 100644
--- a/ucb/source/ucp/expand/makefile.mk
+++ b/ucb/source/ucp/expand/makefile.mk
@@ -28,7 +28,7 @@
 PRJ = ..$/..$/..
 PRJNAME = ucb
 UCPEXPAND_MAJOR = 1
-TARGET = ucpexpand$(UCPEXPAND_MAJOR).uno
+TARGET = $(ENFORCEDSHLPREFIX)ucpexpand$(UCPEXPAND_MAJOR).uno
 ENABLE_EXCEPTIONS = TRUE
 NO_BSYMBOLIC = TRUE
 
diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk
index b5f2734a6986..b9e9a11d3fd4 100644
--- a/ucb/source/ucp/ext/makefile.mk
+++ b/ucb/source/ucp/ext/makefile.mk
@@ -27,7 +27,7 @@
 
 PRJ = ..$/..$/..
 PRJNAME = ucb
-TARGET = ucpext.uno
+TARGET = $(ENFORCEDSHLPREFIX)ucpext.uno
 ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE : settings.mk
diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk
index 82c76b34b206..611a26962385 100644
--- a/ucb/source/ucp/tdoc/makefile.mk
+++ b/ucb/source/ucp/tdoc/makefile.mk
@@ -29,7 +29,7 @@ PRJ=..$/..$/..
 PRJNAME=ucb
 # Version
 UCPTDOC_MAJOR=1
-TARGET=ucptdoc$(UCPTDOC_MAJOR).uno
+TARGET=$(ENFORCEDSHLPREFIX)ucptdoc$(UCPTDOC_MAJOR).uno
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 NO_BSYMBOLIC=TRUE