diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-11 15:47:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-11 15:48:09 +0300 |
| commit | 7fa0cf44a0136774dad213437a7476ae5ebb9e7b (patch) | |
| tree | 5f4dc812b7fa588ea258c574b9f5a27b6145654a /pyuno | |
| parent | 84d10c7cda75b58384d1bbcd4022c3056002813d (diff) | |
Unbreak build on non-Windows
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 5392265f4204..1ea1a302ff95 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 |