Kaydet (Commit) 73e8a118 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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.
üst 036b7d16
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment