diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-11 15:14:49 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-11 15:15:00 +0300 |
| commit | 73e8a1189fd4d4b5ef495a86d86b0c2dcebb9150 (patch) | |
| tree | d783af452749567f305784a6cb7e421641a54311 /pyuno | |
| parent | 036b7d16ddc71adc0708c82b6024237e78cb8593 (diff) | |
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.
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index ecfe994c59d3..5392265f4204 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 |