projects
/
sxemacs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Amazing the difference a paren can make, including fix my last commit.
[sxemacs]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
17df975
..
5651add
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-55,6
+55,8
@@
sxe_subdirs += lib-src
if DESCEND_MODULES
sxe_subdirs += modules
endif
if DESCEND_MODULES
sxe_subdirs += modules
endif
+## Note that src and lisp are traversed twice on purpose
+## for use of the proper dumped emacs for the autoloads and tests
sxe_subdirs += src lisp src lisp info etc tests
SUBDIRS =
sxe_subdirs += src lisp src lisp info etc tests
SUBDIRS =
@@
-113,8
+115,8
@@
$(ETAGS):
.PHONY: stage1 stage2 build-report time-build-report time-check beta
## Convenience target for SXEmacs beta testers
beta:
.PHONY: stage1 stage2 build-report time-build-report time-check beta
## Convenience target for SXEmacs beta testers
beta:
- $(MAKE) $(
RECURSIVE_MAKE_AR
GS) clean
- $(MAKE) $(
RECURSIVE_MAKE_AR
GS) all
+ $(MAKE) $(
AM_MAKEFLA
GS) clean
+ $(MAKE) $(
AM_MAKEFLA
GS) all
@ touch ,,build.done
## Convenience target for SXEmacs build reporters
@ touch ,,build.done
## Convenience target for SXEmacs build reporters
@@
-134,23
+136,23
@@
env-report:
echo RECURSIVE_MAKE_ARGS="${RECURSIVE_MAKE_ARGS}" ) | tee -a ,,vars.out
time-beta:
echo RECURSIVE_MAKE_ARGS="${RECURSIVE_MAKE_ARGS}" ) | tee -a ,,vars.out
time-beta:
- (time $(MAKE) $(
RECURSIVE_MAKE_AR
GS) beta )2>&1 | tee ,,beta.out
+ (time $(MAKE) $(
AM_MAKEFLA
GS) beta )2>&1 | tee ,,beta.out
time-all:
time-all:
- time $(MAKE) $(
RECURSIVE_MAKE_AR
GS) all
+ time $(MAKE) $(
AM_MAKEFLA
GS) all
time-check:
time-check:
- (time $(MAKE) $(
RECURSIVE_MAKE_AR
GS) check ) 2>&1 | tee ,,make-check.out
+ (time $(MAKE) $(
AM_MAKEFLA
GS) check ) 2>&1 | tee ,,make-check.out
build-report: env-report
build-report: env-report
- $(MAKE) $(
RECURSIVE_MAKE_AR
GS) beta 2>&1 | tee ,,beta.out
+ $(MAKE) $(
AM_MAKEFLA
GS) beta 2>&1 | tee ,,beta.out
@ [ -f ,,build.done ] || exit 1
@ [ -f ,,build.done ] || exit 1
- $(MAKE)
$(RECURSIVE_MAKE_AR
GS) check 2>&1 | tee ,,make-check.out
+ $(MAKE)
-w $(MAKEFLA
GS) check 2>&1 | tee ,,make-check.out
time-build-report: env-report
time-build-report: env-report
- (time $(MAKE) $(RECURSIVE_MAKE_ARGS) beta ) 2>&1 | tee ,,beta.out
+ $(MAKE) $(AM_MAKEFLAGS) time-beta
@ [ -f ,,build.done ] || exit 1
@ [ -f ,,build.done ] || exit 1
- (time $(MAKE) $(RECURSIVE_MAKE_ARGS) check ) 2>&1 | tee ,,make-check.out
+ $(MAKE) $(AM_MAKEFLAGS) time-check
stage1:
@echo
stage1:
@echo