diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:52:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:52:36 +0000 |
| commit | a6134c7c3749ac89362a17280481f2abdf426686 (patch) | |
| tree | 21403efd6456e6133df5594c87676b09b2e923dd /pyuno | |
| parent | deb188b0ff5d96fb8ae140f6173819929aa32fca (diff) | |
INTEGRATION: CWS ooo20040704 (1.6.12); FILE MERGED
2004/07/03 00:31:03 vq 1.6.12.2: #i30801# Windows needs the extra include path too.
2004/06/28 12:53:46 cmc 1.6.12.1: #i30801# allow using system libs if possible
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 39219b012046..f01a3e04290e 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: kz $ $Date: 2004-03-01 11:38:50 $ +# last change: $Author: rt $ $Date: 2004-09-08 16:52:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,10 +68,8 @@ LINKFLAGSDEFS = # do not fail with missing symbols # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : pyversion.mk #------------------------------------------------------------------- -CFLAGS+=-I$(SOLARINCDIR)$/python .IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4" # no -Bdirect for SunWS CC DIRECT = $(LINKFLAGSDEFS) @@ -80,20 +78,31 @@ DIRECT = $(LINKFLAGSDEFS) .IF "$(GUI)" == "UNX" # python expects modules without the lib prefix PYUNO_MODULE=$(DLLDEST)$/pyuno$(DLLPOST) +PYUNORC=pyunorc +.ELSE +.INCLUDE : pyversion.mk +PYUNORC=pyuno.ini +.ENDIF + +.IF "$(SYSTEM_PYTHON)" == "YES" +PYTHONLIB=$(PYTHON_LIBS) +CFLAGS+=$(PYTHON_CFLAGS) +.ELSE # "$(SYSTEM_PYTHON)" == "YES" +.INCLUDE : pyversion.mk +.IF "$(GUI)" == "UNX" # python executable brings in the needed python core symbols, # so this library cannot be checked SHL1NOCHECK=yes -PYUNORC=pyunorc .IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" PYTHONLIB=-lpython -.ENDIF -.ELSE +.ENDIF # "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" +.ELSE # "$(GUI)" == "UNX" # on windows, the python executable also uses the shared library, # so we link pyuno directly to it PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib -PYUNORC=pyuno.ini -.ENDIF - +.ENDIF # "$(GUI)" == "UNX" +CFLAGS+=-I$(SOLARINCDIR)$/python +.ENDIF # "$(SYSTEM_PYTHON)" == "YES" SHL1TARGET=$(TARGET) SLOFILES= \ |