comparison src/Makefile.in @ 91131:33627f760058

(ALL_CFLAGS): Add @M17N_FLT_CFLAGS@. (FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally. (LIBES): Add @M17N_FLT_CFLAGS@.
author Kenichi Handa <handa@m17n.org>
date Sat, 01 Dec 2007 02:35:22 +0000
parents 880960b70474
children 53108e6cea98
comparison
equal deleted inserted replaced
91130:d576e6864dbb 91131:33627f760058
274 -DHAVE_CONFIG_H is needed for some other files to take advantage of 274 -DHAVE_CONFIG_H is needed for some other files to take advantage of
275 the information in ``config.h''. */ 275 the information in ``config.h''. */
276 276
277 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM 277 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
278 since it may have -I options that should override those two. */ 278 since it may have -I options that should override those two. */
279 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ 279 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
280 .c.o: 280 .c.o:
281 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< 281 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
282 282
283 #ifndef LIBX11_MACHINE 283 #ifndef LIBX11_MACHINE
284 #define LIBX11_MACHINE 284 #define LIBX11_MACHINE
584 emacsapp = $(PWD)/$(mac)Emacs.app/ 584 emacsapp = $(PWD)/$(mac)Emacs.app/
585 emacsappsrc = ${srcdir}/../mac/Emacs.app/ 585 emacsappsrc = ${srcdir}/../mac/Emacs.app/
586 #endif 586 #endif
587 587
588 #ifdef HAVE_WINDOW_SYSTEM 588 #ifdef HAVE_WINDOW_SYSTEM
589 FONTSRC = font.h
589 #ifdef USE_FONT_BACKEND 590 #ifdef USE_FONT_BACKEND
590 FONTSRC = font.h
591 #ifdef HAVE_X_WINDOWS 591 #ifdef HAVE_X_WINDOWS
592 #if defined (HAVE_XFT) 592 #if defined (HAVE_XFT)
593 FONTOBJ = font.o xfont.o ftfont.o xftfont.o ftxfont.o 593 FONTOBJ = font.o xfont.o ftfont.o xftfont.o ftxfont.o
594 #elif defined (HAVE_FREETYPE) 594 #elif defined (HAVE_FREETYPE)
595 FONTOBJ = font.o xfont.o ftfont.o ftxfont.o 595 FONTOBJ = font.o xfont.o ftfont.o ftxfont.o
597 FONTOBJ = font.o xfont.o 597 FONTOBJ = font.o xfont.o
598 #endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */ 598 #endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */
599 #else /* ! HAVE_X_WINDOWS */ 599 #else /* ! HAVE_X_WINDOWS */
600 FONTOBJ = font.o 600 FONTOBJ = font.o
601 #endif /* ! HAVE_X_WINDOWS */ 601 #endif /* ! HAVE_X_WINDOWS */
602 #endif /* USE_FONT_BACKEND */ 602 #else /* ! USE_FONT_BACKEND */
603 FONTOBJ = font.o
604 #endif /* ! USE_FONT_BACKEND */
603 #endif /* HAVE_WINDOW_SYSTEM */ 605 #endif /* HAVE_WINDOW_SYSTEM */
604 606
605 /* lastfile must follow all files 607 /* lastfile must follow all files
606 whose initialized data areas should be dumped as pure by dump-emacs. */ 608 whose initialized data areas should be dumped as pure by dump-emacs. */
607 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ 609 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
942 duplicated symbols. If the standard libraries were compiled 944 duplicated symbols. If the standard libraries were compiled
943 with GCC, we might need gnulib again after them. */ 945 with GCC, we might need gnulib again after them. */
944 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \ 946 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \
945 LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ 947 LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
946 LIBS_DEBUG $(GETLOADAVG_LIBS) \ 948 LIBS_DEBUG $(GETLOADAVG_LIBS) \
947 @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ \ 949 @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
948 $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) 950 $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
949 951
950 /* Enable recompilation of certain other files depending on system type. */ 952 /* Enable recompilation of certain other files depending on system type. */
951 953
952 #ifndef OTHER_FILES 954 #ifndef OTHER_FILES