diff options
| author | Martin Hollmichel <mh@openoffice.org> | 2003-06-13 06:51:54 +0000 |
|---|---|---|
| committer | Martin Hollmichel <mh@openoffice.org> | 2003-06-13 06:51:54 +0000 |
| commit | ee540e53ad820379841c30d5c0674de4c8be20d2 (patch) | |
| tree | 8f7b5bd043cd6b81f2eb3cca2457e41cf0213d92 /pyuno | |
| parent | 73d8094fb06ec8bf01c6510f8a931314172001f3 (diff) | |
add: fix for Solaris, #i15539#
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 36371412b441..69830f41c062 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: jbu $ $Date: 2003-03-23 12:12:54 $ +# last change: $Author: mh $ $Date: 2003-06-13 07:51:54 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,6 +78,9 @@ PYUNO_MODULE=$(DLLDEST)$/pyuno$(DLLPOST) # so this library cannot be checked SHL1NOCHECK=yes PYUNORC=pyunorc +.IF "$(OS)"=="SOLARIS" +PYTHONLIB=-lpython +.ENDIF .ELSE # on windows, the python executable also uses the shared library, # so we link pyuno directly to it @@ -131,7 +134,11 @@ $(DLLDEST)$/%.py: %.py .IF "$(GUI)" == "UNX" $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj +.IF "$(OS)" != "SOLARIS" ld -shared -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o +.ELSE + ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o +.ENDIF .ENDIF $(MISC)$/$(PYUNORC) : pyuno |