diff options
| author | Stefan Kangas | 2020-01-15 19:57:27 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2020-01-15 19:57:27 +0100 |
| commit | 576dfc8aa260957f4d0dc0c68cdcb8232a536f42 (patch) | |
| tree | 835d4c85c43e105148a0e9ce3e9398e517e44ab1 /src/Makefile.in | |
| parent | d672ad60e34b4e1dcb28f91d15f1e286acf2f94f (diff) | |
| download | emacs-576dfc8aa260957f4d0dc0c68cdcb8232a536f42.tar.gz emacs-576dfc8aa260957f4d0dc0c68cdcb8232a536f42.zip | |
Remove unused ftx font backend driver
* src/ftxfont.c: Remove file.
* admin/notes/font-backend:
* configure.ac:
* src/Makefile.in:
* src/deps.mk (ftxfont.o):
* src/font.c (syms_of_font):
* src/font.h (top-level, font_property_index):
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Remove unused ftx
font backend driver. Thanks to Glenn Morris for pointing out that it
can be removed. (Bug#34663)
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ab63b926272..552dd2e50ae 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -295,8 +295,8 @@ EMACSRES = @EMACSRES@ | |||
| 295 | W32_RES_LINK=@W32_RES_LINK@ | 295 | W32_RES_LINK=@W32_RES_LINK@ |
| 296 | 296 | ||
| 297 | ## Empty if !HAVE_X_WINDOWS | 297 | ## Empty if !HAVE_X_WINDOWS |
| 298 | ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT | 298 | ## xfont.o ftfont.o xftfont.o if HAVE_XFT |
| 299 | ## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE | 299 | ## xfont.o ftfont.o if HAVE_FREETYPE |
| 300 | ## xfont.o ftfont.o ftcrfont.o if USE_CAIRO | 300 | ## xfont.o ftfont.o ftcrfont.o if USE_CAIRO |
| 301 | ## else xfont.o | 301 | ## else xfont.o |
| 302 | ## if HAVE_HARFBUZZ, hbfont.o is added regardless of the rest | 302 | ## if HAVE_HARFBUZZ, hbfont.o is added regardless of the rest |
| @@ -436,7 +436,7 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ | |||
| 436 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macfont.o \ | 436 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macfont.o \ |
| 437 | w32.o w32console.o w32cygwinx.o w32fns.o w32heap.o w32inevt.o w32notify.o \ | 437 | w32.o w32console.o w32cygwinx.o w32fns.o w32heap.o w32inevt.o w32notify.o \ |
| 438 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ | 438 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ |
| 439 | w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \ | 439 | w16select.o widget.o xfont.o ftfont.o xftfont.o gtkutil.o \ |
| 440 | xsettings.o xgselect.o termcap.o hbfont.o | 440 | xsettings.o xgselect.o termcap.o hbfont.o |
| 441 | 441 | ||
| 442 | ## gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty. | 442 | ## gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty. |