HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
symbol plist accessor
[bpt/emacs.git]
/
GNUmakefile
diff --git
a/GNUmakefile
b/GNUmakefile
index
25c586d
..
b4b33f4
100644
(file)
--- a/
GNUmakefile
+++ b/
GNUmakefile
@@
-1,6
+1,6
@@
# Build Emacs from a fresh tarball or version-control checkout.
# Build Emacs from a fresh tarball or version-control checkout.
-# Copyright (C) 2011-201
3
Free Software Foundation, Inc.
+# Copyright (C) 2011-201
4
Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
#
# This file is part of GNU Emacs.
#
@@
-32,12
+32,6
@@
# run "configure" by hand. But run autogen.sh first, if the source
# was checked out directly from the repository.
# run "configure" by hand. But run autogen.sh first, if the source
# was checked out directly from the repository.
-ifneq ($(MSYSTEM),)
-CFG = CONFIG_SITE=$(CURDIR)/nt/mingw-cfg.site
-else
-CFG =
-endif
-
# If a Makefile already exists, just use it.
ifeq ($(wildcard Makefile),Makefile)
# If a Makefile already exists, just use it.
ifeq ($(wildcard Makefile),Makefile)
@@
-61,7
+55,9
@@
else
# Once 'configure' exists, run it.
# Finally, run the actual 'make'.
# Once 'configure' exists, run it.
# Finally, run the actual 'make'.
-default $(filter-out configure Makefile,$(MAKECMDGOALS)): Makefile
+ORDINARY_GOALS = $(filter-out configure Makefile bootstrap,$(MAKECMDGOALS))
+
+default $(ORDINARY_GOALS): Makefile
$(MAKE) -f Makefile $(MAKECMDGOALS)
# Execute in sequence, so that multiple user goals don't conflict.
.NOTPARALLEL:
$(MAKE) -f Makefile $(MAKECMDGOALS)
# Execute in sequence, so that multiple user goals don't conflict.
.NOTPARALLEL:
@@
-75,8
+71,14
@@
configure:
Makefile: configure
@echo >&2 'There seems to be no Makefile in this directory.'
@echo >&2 'Running ./configure ...'
Makefile: configure
@echo >&2 'There seems to be no Makefile in this directory.'
@echo >&2 'Running ./configure ...'
-
$(CFG)
./configure
+ ./configure
@echo >&2 'Makefile built.'
@echo >&2 'Makefile built.'
+# 'make bootstrap' in a fresh checkout needn't run 'configure' twice.
+bootstrap: Makefile
+ $(MAKE) -f Makefile all
+
+.PHONY: bootstrap default $(ORDINARY_GOALS)
+
endif
endif
endif
endif