diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:18:25 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:18:25 +0000 |
commit | b80fd9956bb01b3224fd61140e0e6aec1a45b9ae (patch) | |
tree | 317c7fb08331573ab178e6c7126664b7092f99a1 /pyuno/source | |
parent | 562736c914ea1fb9383704678c01fb519a8e5db6 (diff) |
INTEGRATION: CWS pj49 (1.12.2); FILE MERGED
2006/01/25 19:48:29 pjanik 1.12.2.1: #i61137#: pyuno.so is a loadable module, not shared library -> link
with -bundle instead of -dynamiclib.
Diffstat (limited to 'pyuno/source')
-rw-r--r-- | pyuno/source/module/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 465e5efaa98c..b6f4685ce3f5 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: obo $ $Date: 2006-01-16 15:54:58 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:18:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -129,7 +129,7 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj .ELIF "$(OS)" == "NETBSD" @+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "MACOSX" - @+ echo $(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @+ echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELSE @+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ENDIF |