aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2010-04-12 12:59:35 +0200
committerJan Djärv2010-04-12 12:59:35 +0200
commitc9b389c0ccd3525c79bc0bb9a95be15ea3da05b1 (patch)
tree6b61025bba13fcdfe70ae2a7d47b29d78175573f
parent866a453532ab842630966d3d59cef7262d0c5b52 (diff)
downloademacs-c9b389c0ccd3525c79bc0bb9a95be15ea3da05b1.tar.gz
emacs-c9b389c0ccd3525c79bc0bb9a95be15ea3da05b1.zip
Change so emacs at least compiles.
#undef C_SWITCH_MACHINE #undef C_SWITCH_SYSTEM #undef C_SWITCH_X_SITE
-rw-r--r--src/Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index d9ba6ffb9d1..afb62b96290 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -250,9 +250,13 @@ GCONF_LIBS = @GCONF_LIBS@
250 -DHAVE_CONFIG_H is needed for some other files to take advantage of 250 -DHAVE_CONFIG_H is needed for some other files to take advantage of
251 the information in ``config.h''. */ 251 the information in ``config.h''. */
252 252
253#undef C_SWITCH_MACHINE
254#undef C_SWITCH_SYSTEM
255#undef C_SWITCH_X_SITE
256
253/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM 257/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
254 since it may have -I options that should override those two. */ 258 since it may have -I options that should override those two. */
255ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} 259ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
256ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ 260ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
257 261
258.SUFFIXES: .m 262.SUFFIXES: .m