Mercurial > emacs

comparison src/Makefile.in @ 94918:9c6ecf192e1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Delete USE_FONT_BACKEND conditionals. (frame.o, image.o, print.o): Depend on $(FONTSRC).
author Kenichi Handa <handa@m17n.org>
date Wed, 14 May 2008 01:09:06 +0000
parents 73a86a36a458
children a46a8a839596
comparison
equal deleted inserted replaced
94917:e61553aa7a73 94918:9c6ecf192e1e
539 emacsappsrc = ${srcdir}/../mac/Emacs.app/ 539 emacsappsrc = ${srcdir}/../mac/Emacs.app/
540 #endif 540 #endif
541 541
542 #ifdef HAVE_WINDOW_SYSTEM 542 #ifdef HAVE_WINDOW_SYSTEM
543 FONTSRC = font.h 543 FONTSRC = font.h
544 #ifdef USE_FONT_BACKEND
545 #ifdef HAVE_X_WINDOWS 544 #ifdef HAVE_X_WINDOWS
546 #if defined (HAVE_XFT) 545 #if defined (HAVE_XFT)
547 FONTOBJ = font.o xfont.o ftfont.o xftfont.o ftxfont.o 546 FONTOBJ = font.o xfont.o ftfont.o xftfont.o ftxfont.o
548 #elif defined (HAVE_FREETYPE) 547 #elif defined (HAVE_FREETYPE)
549 FONTOBJ = font.o xfont.o ftfont.o ftxfont.o 548 FONTOBJ = font.o xfont.o ftfont.o ftxfont.o
551 FONTOBJ = font.o xfont.o 550 FONTOBJ = font.o xfont.o
552 #endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */ 551 #endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */
553 #else /* ! HAVE_X_WINDOWS */ 552 #else /* ! HAVE_X_WINDOWS */
554 FONTOBJ = font.o 553 FONTOBJ = font.o
555 #endif /* ! HAVE_X_WINDOWS */ 554 #endif /* ! HAVE_X_WINDOWS */
556 #else /* ! USE_FONT_BACKEND */
557 FONTOBJ = font.o
558 #endif /* ! USE_FONT_BACKEND */
559 #endif /* HAVE_WINDOW_SYSTEM */ 555 #endif /* HAVE_WINDOW_SYSTEM */
560 556
561 /* lastfile must follow all files 557 /* lastfile must follow all files
562 whose initialized data areas should be dumped as pure by dump-emacs. */ 558 whose initialized data areas should be dumped as pure by dump-emacs. */
563 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ 559 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
1084 coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h) 1080 coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h)
1085 filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \ 1081 filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \
1086 epaths.h $(config_h) 1082 epaths.h $(config_h)
1087 filemode.o: filemode.c $(config_h) 1083 filemode.o: filemode.c $(config_h)
1088 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ 1084 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
1089 blockinput.h atimer.h systime.h buffer.h character.h fontset.h \ 1085 blockinput.h atimer.h systime.h buffer.h character.h fontset.h $(FONTSRC) \
1090 msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h) 1086 msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h)
1091 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h) 1087 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h)
1092 font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ 1088 font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
1093 font.h $(config_h) 1089 font.h $(config_h)
1094 ftfont.o: dispextern.h frame.h character.h charset.h font.h $(config_h) 1090 ftfont.o: dispextern.h frame.h character.h charset.h font.h $(config_h)
1095 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \ 1091 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \
1096 charset.h frame.h keyboard.h termhooks.h $(FONTSRC) $(config_h) 1092 charset.h frame.h keyboard.h termhooks.h $(FONTSRC) $(config_h)
1097 getloadavg.o: getloadavg.c $(config_h) 1093 getloadavg.o: getloadavg.c $(config_h)
1098 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ 1094 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
1099 systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h) 1095 systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(FONTSRC) \
1096 $(config_h)
1100 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ 1097 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
1101 termopts.h disptab.h region-cache.h character.h category.h composite.h \ 1098 termopts.h disptab.h region-cache.h character.h category.h composite.h \
1102 dispextern.h keyboard.h 1099 dispextern.h keyboard.h
1103 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \ 1100 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \
1104 dispextern.h atimer.h systime.h region-cache.h $(config_h) 1101 dispextern.h atimer.h systime.h region-cache.h $(config_h)
1220 fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \ 1217 fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \
1221 keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ 1218 keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \
1222 blockinput.h atimer.h systime.h xterm.h termhooks.h 1219 blockinput.h atimer.h systime.h xterm.h termhooks.h
1223 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \ 1220 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
1224 $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ 1221 $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \
1225 blockinput.h atimer.h systime.h 1222 blockinput.h atimer.h systime.h $(FONTSRC)
1226 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \ 1223 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
1227 charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h 1224 charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h
1228 1225
1229 /* Text properties support */ 1226 /* Text properties support */
1230 textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \ 1227 textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \