comparison src/Makefile.in @ 83222:ae7fab96922c

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-634 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-635 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-636 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-637 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-638 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56 Update from CVS: Add lisp/legacy-gnus-agent.el * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-262
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 25 Oct 2004 18:17:28 +0000
parents d83f49cefda3 1293d7f90911
children 7a0245dd1848
comparison
equal deleted inserted replaced
83221:0fc4928cc48e 83222:ae7fab96922c
907 907
908 #ifndef OBJECTS_MACHINE 908 #ifndef OBJECTS_MACHINE
909 #define OBJECTS_MACHINE 909 #define OBJECTS_MACHINE
910 #endif 910 #endif
911 911
912 #ifdef HAVE_RANDOM_HEAPSTART
913 #undef i386
914 RUN_TEMACS = @SETARCH@ i386 ./temacs
915 #else
916 RUN_TEMACS = ./temacs 912 RUN_TEMACS = ./temacs
917 #endif
918 913
919 all: emacs${EXEEXT} OTHER_FILES 914 all: emacs${EXEEXT} OTHER_FILES
920 915
921 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} 916 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
922 #ifdef CANNOT_DUMP 917 #ifdef CANNOT_DUMP