From ac96711a3b532b5da9ec3900576a83814d37b833 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Sat, 1 Dec 2007 02:35:22 +0000 Subject: [PATCH] (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@. (FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally. (LIBES): Add @M17N_FLT_CFLAGS@. --- src/Makefile.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 401f9a92ed..5e476cd59c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -276,7 +276,7 @@ TOOLKIT_DEFINES = /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ -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@ +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@ .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< @@ -586,8 +586,8 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/ #endif #ifdef HAVE_WINDOW_SYSTEM -#ifdef USE_FONT_BACKEND FONTSRC = font.h +#ifdef USE_FONT_BACKEND #ifdef HAVE_X_WINDOWS #if defined (HAVE_XFT) FONTOBJ = font.o xfont.o ftfont.o xftfont.o ftxfont.o @@ -599,7 +599,9 @@ FONTOBJ = font.o xfont.o #else /* ! HAVE_X_WINDOWS */ FONTOBJ = font.o #endif /* ! HAVE_X_WINDOWS */ -#endif /* USE_FONT_BACKEND */ +#else /* ! USE_FONT_BACKEND */ +FONTOBJ = font.o +#endif /* ! USE_FONT_BACKEND */ #endif /* HAVE_WINDOW_SYSTEM */ /* lastfile must follow all files @@ -944,7 +946,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \ LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ LIBS_DEBUG $(GETLOADAVG_LIBS) \ - @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ \ + @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) /* Enable recompilation of certain other files depending on system type. */ -- 2.20.1