[Emacs-commit] emacs/src Makefile.in

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/06/13 22:18:06

Modified files:
        src            : Makefile.in 

Log message:
        (ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
        @FONTCONFIG_CFLAGS@, and @address@hidden
        (LIB_X11_LIB): If HAVE_XFT is defined, set to @address@hidden
        (FONTSRC, FONTOBJ): New variables.
        (obj): Add $(FONTOBJ).
        (SOME_MACHINE_OBJECTS): Lib_X11_Lib.
        (LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
        @address@hidden
        (font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
        (fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
        $(FONTSRC).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/Makefile.in?cvsroot=emacs&only_with_tag=emacs&r1=1.279.2.26&r2=1.279.2.27