procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/Makefile.in: Simplify conditionals.

Browse source
This commit is contained in:
Andreas Schwab 2021-10-03 19:36:53 +02:00
parent 121a5abeae
commit 5deeb0947d
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Makefile.in
View file

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