diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:52:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:52:23 +0000 |
| commit | deb188b0ff5d96fb8ae140f6173819929aa32fca (patch) | |
| tree | 3cc0a184f3752a485352c07f788a77ad510f4df5 /pyuno | |
| parent | 385b0e6a2da12d030b7173155b4aae341dd2ad2e (diff) | |
INTEGRATION: CWS ooo20040704 (1.6.12); FILE MERGED
2004/07/02 09:13:04 cmc 1.6.12.3: #i30891# revert header and namespace change
2004/07/02 07:20:40 cmc 1.6.12.2: #i30801# wrong makefile tweak
2004/06/28 12:53:45 cmc 1.6.12.1: #i30801# allow using system libs if possible
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index b2e784ab006b..429631df8fba 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: kz $ $Date: 2004-03-26 10:16:56 $ +# last change: $Author: rt $ $Date: 2004-09-08 16:52:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,16 +69,22 @@ ENABLE_EXCEPTIONS=TRUE DLLPRE = -.INCLUDE : pyversion.mk #------------------------------------------------------------------- -CFLAGS+=-I$(SOLARINCDIR)$/python - .IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4" # no -Bdirect for SunWS CC DIRECT = $(LINKFLAGSDEFS) .ENDIF +.IF "$(SYSTEM_PYTHON)" == "YES" +SHL1NOCHECK=yes +PYTHONLIB=$(PYTHON_LIBS) +CFLAGS+=$(PYTHON_CFLAGS) +.ELSE +.INCLUDE : pyversion.mk + +CFLAGS+=-I$(SOLARINCDIR)$/python + .IF "$(GUI)" == "UNX" PYUNOLIB=-lpyuno PYTHONLIB=-lpython @@ -86,6 +92,7 @@ PYTHONLIB=-lpython PYUNOLIB=ipyuno.lib PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib .ENDIF +.ENDIF SHL1TARGET= $(TARGET) |