HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
guile-snarf configuration
[bpt/emacs.git]
/
GNUmakefile
diff --git
a/GNUmakefile
b/GNUmakefile
index
22c57f5
..
b4b33f4
100644
(file)
--- a/
GNUmakefile
+++ b/
GNUmakefile
@@
-55,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:
@@
-72,5
+74,11
@@
Makefile: configure
./configure
@echo >&2 'Makefile built.'
./configure
@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