605406 - Small issues with in-tree freetype2 build

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

Attachment: Dont build files that are included in ftbase.c

When trying to build with the patches in bug 603370 and its dependencies on android, I found out 2 small issues, one of which I'm really wondering how it hasn't hit us before:
- freetype2 is given twice on the link command (not a big problem)
- some functions are included twice in the in-tree freetype2, because some .c files are built from Makefile.in, while they already are built from ftbase.c which includes them.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Don't put libfreetype twice on the link command line

When building against in-tree cairo, the cairo ld flags already contain freetype fd flags, in which case adding them again is redundant.

Comment 2

[Mike Hommey [:glandium]]

http://hg.mozilla.org/mozilla-central/rev/c2c173d7091c
http://hg.mozilla.org/mozilla-central/rev/3671421f858c