Mercurial > emacs
comparison src/Makefile.in @ 107834:f36f0163800c
Restore C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Mon, 12 Apr 2010 13:28:56 +0200 |
parents | 51f7fb963d79 |
children | 1238265da61e |
comparison
equal
deleted
inserted
replaced
107833:51f7fb963d79 | 107834:f36f0163800c |
---|---|
254 #undef C_SWITCH_SYSTEM | 254 #undef C_SWITCH_SYSTEM |
255 #undef C_SWITCH_X_SITE | 255 #undef C_SWITCH_X_SITE |
256 | 256 |
257 /* 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 |
258 since it may have -I options that should override those two. */ | 258 since it may have -I options that should override those two. */ |
259 ALL_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} | 259 ALL_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} |
260 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ | 260 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ |
261 | 261 |
262 .SUFFIXES: .m | 262 .SUFFIXES: .m |
263 .c.o: | 263 .c.o: |
264 #ifdef AUTO_DEPEND | 264 #ifdef AUTO_DEPEND |