aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-05-23 15:07:17 -0700
committerPaul Eggert2015-05-23 15:08:19 -0700
commitfa658b2e9075f6990e52c2f08a70586c87e98d22 (patch)
treecce7304e577211f7b86bfee032c919d96864f8fd /src
parent126b0d9865bd96953597cb2782e42e18136f2460 (diff)
downloademacs-fa658b2e9075f6990e52c2f08a70586c87e98d22.tar.gz
emacs-fa658b2e9075f6990e52c2f08a70586c87e98d22.zip
Put default action first in src/Makefile
* src/Makefile.in (all): Put this rule before lisp.mk. That way, plain 'make' works in the src directory again.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index d0df3260356..ad235bbcd4d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -422,6 +422,9 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
422FIRSTFILE_OBJ=@FIRSTFILE_OBJ@ 422FIRSTFILE_OBJ=@FIRSTFILE_OBJ@
423ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) 423ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
424 424
425all: emacs$(EXEEXT) $(OTHER_FILES)
426.PHONY: all
427
425## This is the list of all Lisp files that might be loaded into the 428## This is the list of all Lisp files that might be loaded into the
426## dumped Emacs. Some of them are not loaded on all platforms, but 429## dumped Emacs. Some of them are not loaded on all platforms, but
427## the DOC file on every platform uses them (because the DOC file is 430## the DOC file on every platform uses them (because the DOC file is
@@ -466,9 +469,6 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
466 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \ 469 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \
467 $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ) 470 $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ)
468 471
469all: emacs$(EXEEXT) $(OTHER_FILES)
470.PHONY: all
471
472$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) 472$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
473 $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" 473 $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)"
474 474