Mercurial > emacs

comparison src/Makefile.in @ 96923:d89afa2b4c2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* config.in: Regenerate. * s/ms-w32.h (subprocesses): Define unconditionally. * s/template.h (subprocesses): Update comment. * s/vms.h (subprocesses): * s/usg5-4.h (subprocesses): * s/hpux10-20.h (subprocesses): * s/gnu-linux.h (subprocesses): * s/cygwin.h (subprocesses): * s/bsd-common.h (subprocesses): * s/aix4-2.h (subprocesses): * s/darwin.h (subprocesses): Do not define, defined by default now. * Makefile.in (C_SWITCH_SITE, LD_SWITCH_SITE): Remove, unused. Remove all references. (temacs): Add GNUStep specific ld flags. * Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE. * config.nt (C_SWITCH_SITE, LD_SWITCH_SITE): Do not undefine. * Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE. * configure.in (LD_SWITCH_SITE): Remove, set the values directly in src/Makefile.in. (static): Remove, autoconf would always comment it out anyway. (subprocesses): Define unconditionally.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 23 Jul 2008 06:26:32 +0000
parents d2e4a0ee9816
children 6ac7d0f81157
comparison
equal deleted inserted replaced
96922:35abcad873d6 96923:d89afa2b4c2f
198 198
199 #ifndef LD_SWITCH_X_DEFAULT 199 #ifndef LD_SWITCH_X_DEFAULT
200 #define LD_SWITCH_X_DEFAULT 200 #define LD_SWITCH_X_DEFAULT
201 #endif 201 #endif
202 202
203 /* These can be passed in from config.h to define special load and
204 compile switches needed by individual sites */
205 #ifndef LD_SWITCH_SITE
206 #define LD_SWITCH_SITE
207 #endif
208
209 #ifndef C_SWITCH_SITE
210 #define C_SWITCH_SITE
211 #endif
212
213 #ifndef ORDINARY_LINK 203 #ifndef ORDINARY_LINK
214 204
215 #ifndef CRT0_COMPILE 205 #ifndef CRT0_COMPILE
216 #define CRT0_COMPILE $(CC) -c $(ALL_CFLAGS) 206 #define CRT0_COMPILE $(CC) -c $(ALL_CFLAGS)
217 #endif 207 #endif
261 -DHAVE_CONFIG_H is needed for some other files to take advantage of 251 -DHAVE_CONFIG_H is needed for some other files to take advantage of
262 the information in ``config.h''. */ 252 the information in ``config.h''. */
263 253
264 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM 254 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
265 since it may have -I options that should override those two. */ 255 since it may have -I options that should override those two. */
266 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(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} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ 256 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} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
267 .SUFFIXES: .m 257 .SUFFIXES: .m
268 .c.o: 258 .c.o:
269 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< 259 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
270 .m.o: 260 .m.o:
271 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) GNU_OBJC_CFLAGS $< 261 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) GNU_OBJC_CFLAGS $<
490 #endif /* not ORDINARY_LINK */ 480 #endif /* not ORDINARY_LINK */
491 481
492 /* Flags to pass to LD only for temacs. */ 482 /* Flags to pass to LD only for temacs. */
493 /* Do not split this line with a backslash. That can cause trouble with 483 /* Do not split this line with a backslash. That can cause trouble with
494 some cpps. */ 484 some cpps. */
495 TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE 485 TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS
496 486
497 /* A macro which other sections of Makefile can redefine to munge the 487 /* A macro which other sections of Makefile can redefine to munge the
498 flags before they are passed to LD. This is helpful if you have 488 flags before they are passed to LD. This is helpful if you have
499 redefined LD to something odd, like "gcc". 489 redefined LD to something odd, like "gcc".
500 (The YMF prefix is a holdover from the old name "ymakefile".) 490 (The YMF prefix is a holdover from the old name "ymakefile".)
963 cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} 953 cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
964 954
965 temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} 955 temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
966 echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst 956 echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
967 #ifdef NS_IMPL_GNUSTEP 957 #ifdef NS_IMPL_GNUSTEP
968 $(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS}) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES} 958 $(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS} -lgnustep-gui -lgnustep-base -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES}
969 #else 959 #else
970 $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ 960 $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
971 -o temacs ${STARTFILES} ${obj} ${otherobj} \ 961 -o temacs ${STARTFILES} ${obj} ${otherobj} \
972 OBJECTS_MACHINE ${LIBES} 962 OBJECTS_MACHINE ${LIBES}
973 #endif 963 #endif
991 981
992 /* Encode the values of these two macros in Make variables, 982 /* Encode the values of these two macros in Make variables,
993 so we can use $(...) to substitute their values within "...". */ 983 so we can use $(...) to substitute their values within "...". */
994 C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE 984 C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
995 C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM 985 C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM
996 C_SWITCH_SITE_1 = C_SWITCH_SITE
997 C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE 986 C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
998 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE 987 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
999 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM 988 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
1000 989
1001 #ifdef USE_X_TOOLKIT 990 #ifdef USE_X_TOOLKIT
1005 cd ${lwlibdir}; ${MAKE} ${MFLAGS} \ 994 cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
1006 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ 995 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
1007 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ 996 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
1008 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ 997 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
1009 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ 998 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
1010 "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
1011 "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \ 999 "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
1012 "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" 1000 "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
1013 @true /* make -t should not create really-lwlib. */ 1001 @true /* make -t should not create really-lwlib. */
1014 .PHONY: really-lwlib 1002 .PHONY: really-lwlib
1015 #else /* not USE_X_TOOLKIT */ 1003 #else /* not USE_X_TOOLKIT */
1019 cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \ 1007 cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
1020 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ 1008 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
1021 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ 1009 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
1022 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ 1010 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
1023 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ 1011 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
1024 "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
1025 "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \ 1012 "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
1026 "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" 1013 "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
1027 @true /* make -t should not create really-oldXMenu. */ 1014 @true /* make -t should not create really-oldXMenu. */
1028 .PHONY: really-oldXMenu 1015 .PHONY: really-oldXMenu
1029 #endif /* not USE_X_TOOLKIT */ 1016 #endif /* not USE_X_TOOLKIT */