[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 5deeb09: * src/Makefile.in: Simplify conditionals.
From: |
Andreas Schwab |
Subject: |
emacs-28 5deeb09: * src/Makefile.in: Simplify conditionals. |
Date: |
Sun, 3 Oct 2021 13:46:37 -0400 (EDT) |
branch: emacs-28
commit 5deeb0947d3663b78c2fb975d1252b85e12fce86
Author: Andreas Schwab <schwab@linux-m68k.org>
Commit: Andreas Schwab <schwab@linux-m68k.org>
* src/Makefile.in: Simplify conditionals.
---
src/Makefile.in | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 46faeb6..c4e57ca 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 5deeb09: * src/Makefile.in: Simplify conditionals.,
Andreas Schwab <=