[Libreoffice-commits] .: pyuno/source

[Tor Lillqvist]

 pyuno/source/module/makefile.mk |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 06cb5818105e299e0528abf9ceb1a5514ede30c6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed May 11 15:47:20 2011 +0300

    Unbreak build on non-Windows

diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index 5392265..1ea1a30 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -113,9 +113,18 @@ ALLTAR : \
 $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
     dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
 .ELSE
+
+.IF "$(GUI)"!="WNT"
+# For some reason the build breaks on Windows if this is listed in the
+# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go
+# figure. But we need it on non-Windows.
+targetdll=$(LB)$/$(TARGET)$(DLLPOST)
+.ENDIF
+
 ALLTAR : \
     $(DLLDEST)$/uno.py \
     $(DLLDEST)$/unohelper.py \
+    $(targetdll) \
     $(MISC)$/$(PYUNORC)
 .ENDIF
 .ENDIF