mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-31 20:02:42 +00:00
* src/Makefile.in: Simplify conditionals.
This commit is contained in:
parent
121a5abeae
commit
5deeb0947d
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user