From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 3 Oct 2021 17:36:53 +0000 (+0200)
Subject: * src/Makefile.in: Simplify conditionals.
X-Git-Tag: emacs-28.0.90~439
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5deeb0947d3663b78c2fb975d1252b85e12fce86;p=emacs.git

* src/Makefile.in: Simplify conditionals.
---

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@
 ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 
 # Must be first, before dep inclusion!
-ifeq ($(HAVE_NATIVE_COMP),yes)
-ifeq ($(NATIVE_DISABLED),)
-all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES) ../native-lisp
-else
-all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES)
-endif
-else
 all: emacs$(EXEEXT) $(pdmp) $(OTHER_FILES)
+ifeq ($(HAVE_NATIVE_COMP):$(NATIVE_DISABLED),yes:)
+all: ../native-lisp
 endif
 .PHONY: all
 
@@ -785,8 +780,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
 	@$(MAKE) $(AM_V_NO_PD) -C ../lisp EMACS="$(bootstrap_exe)"\
 		THEFILE=$< $<c
 
-ifeq ($(HAVE_NATIVE_COMP),yes)
-ifeq ($(NATIVE_DISABLED),)
+ifeq ($(HAVE_NATIVE_COMP):$(NATIVE_DISABLED),yes:)
 ## The following rules are used only when building a source tarball
 ## for the first time, when the native-lisp/ directory doesn't yet
 ## exist and needs to be created and populated with the preloaded
@@ -815,7 +809,6 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp}) $(lisp:.elc=.eln)
 		--bin-dest $(BIN_DESTDIR) --eln-dest $(ELN_DESTDIR)
 	cp -f $@ $(bootstrap_pdmp)
 endif
-endif
 
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.