summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-25 12:00:14 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-25 12:00:14 +0000
commitcc98e67c02aeb3c81652253a07626977468f9136 (patch)
treea000b3c56ef4d1614b58999407d19eb92dc67d1f /pyuno
parent4e983f66996d953e56535aa1256170d3e708ccff (diff)
INTEGRATION: CWS systempython (1.8.6); FILE MERGED
2005/01/18 18:54:21 cmc 1.8.6.1: #i40917# update system python
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/loader/makefile.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index d81513dfe3ad..fa0850c65c43 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: obo $ $Date: 2004-11-15 13:12:31 $
+# last change: $Author: obo $ $Date: 2005-01-25 13:00:14 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -77,20 +77,19 @@ DIRECT = $(LINKFLAGSDEFS)
.ENDIF
.IF "$(SYSTEM_PYTHON)" == "YES"
-SHL1NOCHECK=yes
PYTHONLIB=$(PYTHON_LIBS)
CFLAGS+=$(PYTHON_CFLAGS)
.ELSE
.INCLUDE : pyversion.mk
CFLAGS+=-I$(SOLARINCDIR)$/python
+.ENDIF
.IF "$(GUI)" == "UNX"
PYUNOLIB=-lpyuno
.ELSE
PYUNOLIB=ipyuno.lib
.ENDIF
-.ENDIF
SHL1TARGET= $(TARGET)