diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
| commit | 53df3a5262d8af5bc66575ab91cd38a54b7ff096 (patch) | |
| tree | 1d171e39027f741c79e811fdde81e9770dc598b9 /pyuno/source/loader | |
| parent | 87388080cb05950eefaec978f5143e695ba5304b (diff) | |
CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
Diffstat (limited to 'pyuno/source/loader')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index ea5d907250bc..67fbe81e482e 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -94,7 +94,7 @@ COMPONENTS= \ invocadapt.uno \ proxyfac.uno \ reflection.uno \ - pythonloader.uno + .$/pythonloader.uno # --- Targets ------------------------------------------------------ @@ -107,20 +107,12 @@ ALL : ALLTAR \ $(DLLDEST)$/%.py: %.py cp $? $@ -# For Mac OS X, -# The python loader component is linked against libpyuno.dylib, -# which hasn't been delivered yet but dyld needs to know where it is -# so regcomp can load the component. $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST) -rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb -.IF "$(OS)"=="MACOSX" - cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))" -.ELSE .IF "$(GUI)$(COM)"=="WNTGCC" - cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))" + cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))" .ELSE - cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i)) + cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i)) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.ENDIF # $(OS)=="MACOSX" cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb |