diff options
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/source/bridgetest/makefile.mk | 8 | ||||
-rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 57e222dafe22..3cb5fc421d3b 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -192,16 +192,16 @@ $(DLLDEST)$/uno_services.rdb .ERRREMOVE: $(DLLDEST)$/uno_types.rdb \ $(DLLDEST)$/bridgetest.uno$(DLLPOST) $(DLLDEST)$/cppobj.uno$(DLLPOST) \ $(MISC)$/$(TARGET)$/bootstrap.rdb $(SHL3TARGETN) - $(MKDIR) $(@:d) - cd $(DLLDEST) && $(REGCOMP) -register -br uno_types.rdb -r uno_services.rdb\ + cd $(DLLDEST) && $(REGCOMP) -register -br uno_types.rdb -r uno_services.rdb -wop \ -c acceptor.uno$(DLLPOST) \ -c bridgefac.uno$(DLLPOST) \ -c connector.uno$(DLLPOST) \ -c remotebridge.uno$(DLLPOST) \ -c uuresolver.uno$(DLLPOST) \ - -c bridgetest.uno$(DLLPOST) \ - -c cppobj.uno$(DLLPOST) \ + -c .$/bridgetest.uno$(DLLPOST) \ + -c .$/cppobj.uno$(DLLPOST) \ -c stocservices.uno$(DLLPOST) \ - -c $(SHL3TARGETN:f) + -c .$/$(SHL3TARGETN:f) .IF "$(SOLAR_JAVA)" != "" $(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb -r $@ \ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index a232a60a8c93..834e481900e3 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -106,7 +106,7 @@ $(DLLDEST)$/regcomp$(EXECPOST) : $(SOLARBINDIR)$/regcomp$(EXECPOST) $(DLLDEST)$/pyuno_regcomp.rdb: $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb -rm -f $@ - $(WRAPCMD) regmerge $(DLLDEST)$/pyuno_regcomp.rdb / $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb + $(WRAPCMD) $(REGMERGE) $(DLLDEST)$/pyuno_regcomp.rdb / $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb doc .PHONY: @echo start test with dmake runtest |