Mercurial > emacs
diff src/Makefile.in @ 105052:fe2a0bec5d65
* puresize.h (BASE_PURESIZE): Increase to 1290000.
* Makefile.in (OTHER_FILES): Define using autoconf, not cpp.
(OBJECTS_MACHINE): Remove, unused.
* configure.in (OTHER_FILES): Define using autoconf not cpp.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 17 Sep 2009 06:10:44 +0000 |
parents | 90578b9cc2d2 |
children | 480ba0a1e8e2 |
line wrap: on
line diff
--- a/src/Makefile.in Thu Sep 17 06:02:20 2009 +0000 +++ b/src/Makefile.in Thu Sep 17 06:10:44 2009 +0000 @@ -65,6 +65,8 @@ bootstrap_exe = ../src/bootstrap-emacs${EXEEXT} +OTHER_FILES = @OTHER_FILES@ + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ @@ -886,23 +888,13 @@ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) -/* Enable recompilation of certain other files depending on system type. */ - -#ifndef OTHER_FILES -#define OTHER_FILES -#endif - -#ifndef OBJECTS_MACHINE -#define OBJECTS_MACHINE -#endif - #ifdef HAVE_SHM RUN_TEMACS = `/bin/pwd`/temacs -nl #else RUN_TEMACS = `/bin/pwd`/temacs #endif -all: emacs${EXEEXT} OTHER_FILES +all: emacs${EXEEXT} $(OTHER_FILES) emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP} #ifdef CANNOT_DUMP @@ -939,18 +931,18 @@ cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} buildobj.h: Makefile - echo "#define BUILDOBJ \"${obj} ${otherobj} " OBJECTS_MACHINE "\"" > buildobj.h + echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h -temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} +temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} #ifdef NS_IMPL_GNUSTEP $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \ -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ - ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES} + ${obj} ${otherobj} ${LIBES} #else $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ - OBJECTS_MACHINE ${LIBES} + ${LIBES} #endif /* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE @@ -1256,7 +1248,7 @@ $(config_h) /* System-specific programs to be made. - OTHER_FILES and OBJECTS_MACHINE + OTHER_FILES select which of these should be compiled. */ #ifdef HAVE_NS