[Libreoffice-commits] .: pyuno/source

Tor Lillqvist tml at kemper.freedesktop.org
Wed May 11 05:18:34 PDT 2011


 pyuno/source/module/makefile.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6cb4b2e338d47943f29b6eee1d8cadca251c50f2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed May 11 15:14:49 2011 +0300

    Fix build on Windows
    
    No need to mention $(LB)$/$(TARGET)$(DLLPOST) in the ALLTAR
    prerequisite list. It causes errors, and is unnecessary, as pyuno.pyd
    gets built anyway thanks to being the TARGET in this makefile.
    
    No need to do the symlink if DLLPRE is empty. In that case
    $(LB)$/$(TARGET)$(DLLPOST) equals $(LB)$/$(DLLPRE)$(TARGET)$(DLLPOST)
    so dmake will complain about a circular dependency.

diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index ecfe994..5392265 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -116,8 +116,7 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
 ALLTAR : \
     $(DLLDEST)$/uno.py \
     $(DLLDEST)$/unohelper.py \
-    $(MISC)$/$(PYUNORC) \
-    $(LB)$/$(TARGET)$(DLLPOST)
+    $(MISC)$/$(PYUNORC)
 .ENDIF
 .ENDIF
 
@@ -134,10 +133,12 @@ $(MISC)$/pyuno.flt : pyuno.flt
     -rm -f $@
     cat $? > $@
 
+.IF "$(DLLPRE)"!=""
 # python does not accept the "lib" prefix in the module library
 $(LB)$/$(TARGET)$(DLLPOST) : $(LB)$/$(DLLPRE)$(TARGET)$(DLLPOST)
     -rm -f $@
     ln -s $? $@
+.ENDIF
 
 .ENDIF # L10N_framework
 


More information about the Libreoffice-commits mailing list