comparison src/Makefile.in @ 107857:d1934720d87a

Reduce cpp use in Makefile.in. * Makefile.in (DBUS_CFLAGS, DBUS_LIBS, GCONF_CFLAGS, GCONF_LIBS) (LIBSOUND, CFLAGS_SOUND, RSVG_LIBS, RSVG_CFLAGS, INTERVALS_H) (GETLOADAVG_LIBS, RUN_TEMACS): Move to the autoconf section. (ORDINARY_LINK): Remove, defined in src/s/gnu.h. (CRT0_COMPILE): Remove, inline it in the only user.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 14 Apr 2010 08:36:25 -0700
parents 1238265da61e
children 12062a99ca8d e01fea458062
comparison
equal deleted inserted replaced
107856:662fbf539570 107857:d1934720d87a
78 C_SWITCH_SYSTEM=@c_switch_system@ 78 C_SWITCH_SYSTEM=@c_switch_system@
79 C_SWITCH_MACHINE=@c_switch_machine@ 79 C_SWITCH_MACHINE=@c_switch_machine@
80 80
81 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ 81 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
82 82
83 DBUS_CFLAGS = @DBUS_CFLAGS@
84 DBUS_LIBS = @DBUS_LIBS@
85
86 GCONF_CFLAGS = @GCONF_CFLAGS@
87 GCONF_LIBS = @GCONF_LIBS@
88
89 LIBSOUND= @LIBSOUND@
90 CFLAGS_SOUND= @CFLAGS_SOUND@
91
92 RSVG_LIBS= @RSVG_LIBS@
93 RSVG_CFLAGS= @RSVG_CFLAGS@
94
95 INTERVALS_H = dispextern.h intervals.h composite.h
96
97 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
98
99 RUN_TEMACS = `/bin/pwd`/temacs
100
83 # ========================== start of cpp stuff ======================= 101 # ========================== start of cpp stuff =======================
84 /* From here on, comments must be done in C syntax. */ 102 /* From here on, comments must be done in C syntax. */
85 103
86 /* just to be sure the sh is used */ 104 /* just to be sure the sh is used */
87 SHELL=/bin/sh 105 SHELL=/bin/sh
114 #endif 132 #endif
115 133
116 /* On some machines #define register is done in config; 134 /* On some machines #define register is done in config;
117 do not let it interfere with this file. */ 135 do not let it interfere with this file. */
118 #undef register 136 #undef register
119
120 /* GNU libc requires ORDINARY_LINK so that its own crt0 is used.
121 GNU/Linux is an exception because it uses a funny variant of GNU libc. */
122 #ifdef __GNU_LIBRARY__
123 #ifndef GNU_LINUX
124 #define ORDINARY_LINK
125 #endif
126 #endif
127 137
128 /* Some machines do not find the standard C libraries in the usual place. */ 138 /* Some machines do not find the standard C libraries in the usual place. */
129 #ifndef ORDINARY_LINK 139 #ifndef ORDINARY_LINK
130 #ifndef LIB_STANDARD 140 #ifndef LIB_STANDARD
131 #define LIB_STANDARD -lc 141 #define LIB_STANDARD -lc
199 #define LD_SWITCH_X_DEFAULT 209 #define LD_SWITCH_X_DEFAULT
200 #endif 210 #endif
201 211
202 #ifndef ORDINARY_LINK 212 #ifndef ORDINARY_LINK
203 213
204 #ifndef CRT0_COMPILE
205 #define CRT0_COMPILE $(CC) -c $(ALL_CFLAGS)
206 #endif
207
208 #ifndef START_FILES 214 #ifndef START_FILES
209 #ifdef NO_REMAP 215 #ifdef NO_REMAP
210 #define START_FILES pre-crt0.o /lib/crt0.o 216 #define START_FILES pre-crt0.o /lib/crt0.o
211 #else /* ! defined (NO_REMAP) */ 217 #else /* ! defined (NO_REMAP) */
212 #define START_FILES ecrt0.o 218 #define START_FILES ecrt0.o
232 include @GNUSTEP_MAKEFILES@/Additional/gui.make 238 include @GNUSTEP_MAKEFILES@/Additional/gui.make
233 shared=no 239 shared=no
234 #endif 240 #endif
235 241
236 #ifdef HAVE_DBUS 242 #ifdef HAVE_DBUS
237 DBUS_CFLAGS = @DBUS_CFLAGS@
238 DBUS_LIBS = @DBUS_LIBS@
239 DBUS_OBJ = dbusbind.o 243 DBUS_OBJ = dbusbind.o
240 #endif
241
242 #ifdef HAVE_GCONF
243 GCONF_CFLAGS = @GCONF_CFLAGS@
244 GCONF_LIBS = @GCONF_LIBS@
245 #endif 244 #endif
246 245
247 /* DO NOT use -R. There is a special hack described in lastfile.c 246 /* DO NOT use -R. There is a special hack described in lastfile.c
248 which is used instead. Some initialized data areas are modified 247 which is used instead. Some initialized data areas are modified
249 at initial startup, then labeled as part of the text area when 248 at initial startup, then labeled as part of the text area when
368 #else /* not HAVE_X11 */ 367 #else /* not HAVE_X11 */
369 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE 368 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
370 #endif /* not HAVE_X11 */ 369 #endif /* not HAVE_X11 */
371 #endif /* not HAVE_X_WINDOWS */ 370 #endif /* not HAVE_X_WINDOWS */
372 371
373 LIBSOUND= @LIBSOUND@
374 CFLAGS_SOUND= @CFLAGS_SOUND@
375
376 RSVG_LIBS= @RSVG_LIBS@
377 RSVG_CFLAGS= @RSVG_CFLAGS@
378
379 #ifndef ORDINARY_LINK 372 #ifndef ORDINARY_LINK
380 /* Fix linking if compiled with GCC. */ 373 /* Fix linking if compiled with GCC. */
381 #ifdef __GNUC__ 374 #ifdef __GNUC__
382 375
383 #ifdef LINKER 376 #ifdef LINKER
442 (The YMF prefix is a holdover from the old name "ymakefile".) 435 (The YMF prefix is a holdover from the old name "ymakefile".)
443 */ 436 */
444 #ifndef YMF_PASS_LDFLAGS 437 #ifndef YMF_PASS_LDFLAGS
445 #define YMF_PASS_LDFLAGS(flags) flags 438 #define YMF_PASS_LDFLAGS(flags) flags
446 #endif 439 #endif
447
448 /* Allow config.h to specify a replacement file for unexec.c. */
449 #ifndef UNEXEC
450 #define UNEXEC unexec.o
451 #endif
452
453 INTERVALS_H = dispextern.h intervals.h composite.h
454
455 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
456 440
457 #ifdef MSDOS 441 #ifdef MSDOS
458 #ifdef HAVE_X_WINDOWS 442 #ifdef HAVE_X_WINDOWS
459 MSDOS_OBJ = dosfns.o msdos.o xmenu.o 443 MSDOS_OBJ = dosfns.o msdos.o xmenu.o
460 #else 444 #else
842 @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ 826 @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
843 $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ 827 $(GETLOADAVG_LIBS) ${GCONF_LIBS} \
844 @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ 828 @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
845 $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) 829 $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
846 830
847 RUN_TEMACS = `/bin/pwd`/temacs
848
849 all: emacs${EXEEXT} $(OTHER_FILES) 831 all: emacs${EXEEXT} $(OTHER_FILES)
850 832
851 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} 833 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
852 #ifdef CANNOT_DUMP 834 #ifdef CANNOT_DUMP
853 rm -f emacs${EXEEXT} 835 rm -f emacs${EXEEXT}
959 941
960 ecrt0.o: ecrt0.c $(config_h) 942 ecrt0.o: ecrt0.c $(config_h)
961 #ifdef AUTO_DEPEND 943 #ifdef AUTO_DEPEND
962 @-test -d deps || mkdir deps 944 @-test -d deps || mkdir deps
963 #endif 945 #endif
964 CRT0_COMPILE ${srcdir}/ecrt0.c 946 $(CC) -c $(ALL_CFLAGS) ${srcdir}/ecrt0.c
965 doc.o: buildobj.h 947 doc.o: buildobj.h
966 948
967 #ifndef AUTO_DEPEND 949 #ifndef AUTO_DEPEND
968 950
969 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \ 951 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \