[Libreoffice-commits] .: pyuno/source
Christian Lohmaier
cloph at kemper.freedesktop.org
Sat Jun 11 07:52:48 PDT 2011
pyuno/source/loader/makefile.mk | 6 +-----
pyuno/source/module/makefile.mk | 13 ++++++-------
2 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit 93338480a0d5c7d8fc6a4adc9953a0e43c50cc5e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Sat Jun 11 16:53:07 2011 +0200
fix compilation with internal python on Mac
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index d8791e9..76c3dc2 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -85,14 +85,10 @@ $(DLLDEST)$/%.py: %.py
cp $? $@
.ENDIF # L10N_framework
-ALLTAR : $(MISC)/pythonloader.component $(eq,$(OS),MACOSX $(MISC)/installname_loader $(NULL))
+ALLTAR : $(MISC)/pythonloader.component
$(MISC)/pythonloader.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
$(XSLTPROC) --nonet --stringparam uri \
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
-
-$(MISC)/installname_loader : $(LB)/$(TARGET)$(DLLPOST)
- install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $<
- touch $@
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index 81050c1..627a97d 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -90,7 +90,7 @@ SHL1STDLIBS= \
$(PYTHONLIB) \
$(EXTRA_FRAMEWORK_FLAG)
-SHL1DEPN=
+SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL))
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1IMPLIB= i$(TARGET)
@@ -121,7 +121,7 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
targetdll=$(LB)$/$(TARGET)$(DLLPOST)
.ENDIF
-ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \
+ALLTAR : \
$(DLLDEST)$/uno.py \
$(DLLDEST)$/unohelper.py \
$(targetdll) \
@@ -134,11 +134,10 @@ ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \
$(DLLDEST)$/%.py: %.py
cp $? $@
-$(MISC)/installname_module : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST)
- install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $<
- # hack to make checkdll happy
- ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework
- touch $@
+# make checkdll happy
+$(MISC)/framework_link :
+ $(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework
+ @touch $@
$(MISC)$/$(PYUNORC) : pyuno
-rm -f $@
More information about the Libreoffice-commits
mailing list