Mercurial > emacs

comparison src/Makefile.in @ 107829:f008e626c316

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use autoconf, not cpp for some variables. * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) (C_SWITCH_X_SITE): Define using autoconf, not cpp. (ALL_CFLAGS): Use them as make variables. (really-lwlib, really-oldXMenu): Do not pass them.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 11 Apr 2010 13:04:24 -0700
parents 1f5000fd5ff7
children 92451fdcc718
comparison
equal deleted inserted replaced
107828:6d3accd249f7 107829:f008e626c316
73 LIBPNG=@LIBPNG@ 73 LIBPNG=@LIBPNG@
74 LIBGIF=@LIBGIF@ 74 LIBGIF=@LIBGIF@
75 LIBXPM=@LIBXPM@ 75 LIBXPM=@LIBXPM@
76 XFT_LIBS=@XFT_LIBS@ 76 XFT_LIBS=@XFT_LIBS@
77 77
78 C_SWITCH_SYSTEM=@c_switch_system@
79 C_SWITCH_MACHINE=@c_switch_machine@
80
81 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
82
78 # ========================== start of cpp stuff ======================= 83 # ========================== start of cpp stuff =======================
79 /* From here on, comments must be done in C syntax. */ 84 /* From here on, comments must be done in C syntax. */
80
81 C_SWITCH_SYSTEM=
82 85
83 /* just to be sure the sh is used */ 86 /* just to be sure the sh is used */
84 SHELL=/bin/sh 87 SHELL=/bin/sh
85 88
86 #define THIS_IS_MAKEFILE 89 #define THIS_IS_MAKEFILE
178 that should be used for linking anything else. */ 181 that should be used for linking anything else. */
179 #ifndef LD_SWITCH_MACHINE_TEMACS 182 #ifndef LD_SWITCH_MACHINE_TEMACS
180 #define LD_SWITCH_MACHINE_TEMACS 183 #define LD_SWITCH_MACHINE_TEMACS
181 #endif 184 #endif
182 185
183 /* Some m/MACHINE.h files define this to request special switches in cc. */
184 #ifndef C_SWITCH_MACHINE
185 #define C_SWITCH_MACHINE
186 #endif
187
188 /* Some s/SYSTEM.h files define this to request special switches in cc. */
189 #ifndef C_SWITCH_SYSTEM
190 #define C_SWITCH_SYSTEM
191 #endif
192
193 /* These macros are for switches specifically related to X Windows. */ 186 /* These macros are for switches specifically related to X Windows. */
194 #ifndef C_SWITCH_X_MACHINE 187 #ifndef C_SWITCH_X_MACHINE
195 #define C_SWITCH_X_MACHINE 188 #define C_SWITCH_X_MACHINE
196 #endif 189 #endif
197 190
198 #ifndef C_SWITCH_X_SYSTEM 191 #ifndef C_SWITCH_X_SYSTEM
199 #define C_SWITCH_X_SYSTEM 192 #define C_SWITCH_X_SYSTEM
200 #endif
201
202 #ifndef C_SWITCH_X_SITE
203 #define C_SWITCH_X_SITE
204 #endif 193 #endif
205 194
206 #ifndef LD_SWITCH_X_SITE 195 #ifndef LD_SWITCH_X_SITE
207 #define LD_SWITCH_X_SITE 196 #define LD_SWITCH_X_SITE
208 #endif 197 #endif
267 -DHAVE_CONFIG_H is needed for some other files to take advantage of 256 -DHAVE_CONFIG_H is needed for some other files to take advantage of
268 the information in ``config.h''. */ 257 the information in ``config.h''. */
269 258
270 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM 259 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
271 since it may have -I options that should override those two. */ 260 since it may have -I options that should override those two. */
272 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 C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} 261 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 C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
273 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ 262 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
274 263
275 .SUFFIXES: .m 264 .SUFFIXES: .m
276 .c.o: 265 .c.o:
277 #ifdef AUTO_DEPEND 266 #ifdef AUTO_DEPEND
922 /* Supply an ordering for parallel make. */ 911 /* Supply an ordering for parallel make. */
923 ../src/$(OLDXMENU): ${OLDXMENU} 912 ../src/$(OLDXMENU): ${OLDXMENU}
924 913
925 /* Encode the values of these two macros in Make variables, 914 /* Encode the values of these two macros in Make variables,
926 so we can use $(...) to substitute their values within "...". */ 915 so we can use $(...) to substitute their values within "...". */
927 C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
928 C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM
929 C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
930 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE 916 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
931 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM 917 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
932 918
933 #ifdef USE_X_TOOLKIT 919 #ifdef USE_X_TOOLKIT
934 $(OLDXMENU): really-lwlib 920 $(OLDXMENU): really-lwlib
935 921
936 really-lwlib: 922 really-lwlib:
937 cd ${lwlibdir}; ${MAKE} ${MFLAGS} \ 923 cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
938 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ 924 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
939 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
940 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ 925 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
941 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ 926 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
942 "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
943 "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
944 @true /* make -t should not create really-lwlib. */ 927 @true /* make -t should not create really-lwlib. */
945 .PHONY: really-lwlib 928 .PHONY: really-lwlib
946 #else /* not USE_X_TOOLKIT */ 929 #else /* not USE_X_TOOLKIT */
947 $(OLDXMENU): really-oldXMenu 930 $(OLDXMENU): really-oldXMenu
948 931
949 really-oldXMenu: 932 really-oldXMenu:
950 cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \ 933 cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
951 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ 934 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
952 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
953 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ 935 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
954 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ 936 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
955 "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
956 "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
957 @true /* make -t should not create really-oldXMenu. */ 937 @true /* make -t should not create really-oldXMenu. */
958 .PHONY: really-oldXMenu 938 .PHONY: really-oldXMenu
959 #endif /* not USE_X_TOOLKIT */ 939 #endif /* not USE_X_TOOLKIT */
960 #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */ 940 #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */
961 941