diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-08-10 10:36:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-08-10 10:36:07 +0000 |
| commit | 6c60425a32ef06ae12db123f7bd9bfe41cffadba (patch) | |
| tree | 2eaf4839a3939fda16e950a1c818b78146c93041 /pyuno | |
| parent | 439f6872167ddd2aa9158200be18340671cf9c33 (diff) | |
INTEGRATION: CWS fpicandrpath (1.9.8); FILE MERGED
2005/06/16 11:19:43 cmc 1.9.8.1: #i50819# rpath of ORIGIN not 'ORIGIN'
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 12e5c42d72d8..a7b6d21c540b 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: vg $ $Date: 2005-02-16 16:45:24 $ +# last change: $Author: obo $ $Date: 2005-08-10 11:36:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -145,16 +145,20 @@ $(DLLDEST)$/%.py: %.py .IF "$(GUI)" == "UNX" $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj .IF "$(OS)" == "LINUX" - $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o + @+ echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "SOLARIS" - ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o + @+ echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "FREEBSD" - ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o + @+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "NETBSD" - $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o + @+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "MACOSX" - $(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o + @+ echo $(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd +.ELSE + @+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ENDIF + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd .ENDIF |