aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2021-10-03 19:36:53 +0200
committerAndreas Schwab2021-10-03 19:46:13 +0200
commit5deeb0947d3663b78c2fb975d1252b85e12fce86 (patch)
treeb2aef36e2211636d1eca9bb5029ca71c22ae375a /src
parent121a5abeaee85e7955786d838f07103ce074a63b (diff)
downloademacs-5deeb0947d3663b78c2fb975d1252b85e12fce86.tar.gz
emacs-5deeb0947d3663b78c2fb975d1252b85e12fce86.zip
* src/Makefile.in: Simplify conditionals.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 46faeb60098..c4e57ca63be 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -450,14 +450,9 @@ FIRSTFILE_OBJ=@FIRSTFILE_OBJ@
450ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) 450ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
451 451
452# Must be first, before dep inclusion! 452# Must be first, before dep inclusion!
453ifeq ($(HAVE_NATIVE_COMP),yes)
454ifeq ($(NATIVE_DISABLED),)
455all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES) ../native-lisp
456else
457all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES)
458endif
459else
460all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES) 453all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES)
454ifeq ($(HAVE_NATIVE_COMP):$(NATIVE_DISABLED),yes:)
455all: ../native-lisp
461endif 456endif
462.PHONY: all 457.PHONY: all
463 458
@@ -785,8 +780,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
785 @$(MAKE) $(AM_V_NO_PD) -C ../lisp EMACS="$(bootstrap_exe)"\ 780 @$(MAKE) $(AM_V_NO_PD) -C ../lisp EMACS="$(bootstrap_exe)"\
786 THEFILE=$< $<c 781 THEFILE=$< $<c
787 782
788ifeq ($(HAVE_NATIVE_COMP),yes) 783ifeq ($(HAVE_NATIVE_COMP):$(NATIVE_DISABLED),yes:)
789ifeq ($(NATIVE_DISABLED),)
790## The following rules are used only when building a source tarball 784## The following rules are used only when building a source tarball
791## for the first time, when the native-lisp/ directory doesn't yet 785## for the first time, when the native-lisp/ directory doesn't yet
792## exist and needs to be created and populated with the preloaded 786## exist and needs to be created and populated with the preloaded
@@ -815,7 +809,6 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp}) $(lisp:.elc=.eln)
815 --bin-dest $(BIN_DESTDIR) --eln-dest $(ELN_DESTDIR) 809 --bin-dest $(BIN_DESTDIR) --eln-dest $(ELN_DESTDIR)
816 cp -f $@ $(bootstrap_pdmp) 810 cp -f $@ $(bootstrap_pdmp)
817endif 811endif
818endif
819 812
820## VCSWITNESS points to the file that holds info about the current checkout. 813## VCSWITNESS points to the file that holds info about the current checkout.
821## We use it as a heuristic to decide when to rebuild loaddefs.el. 814## We use it as a heuristic to decide when to rebuild loaddefs.el.