X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=Makefile.am;h=5651add19e2f07dfa1cf967808be25622dade5c4;hb=5c14c1d0f287c56ced4276526f61d90ce2420212;hp=8f04c9de3d4adb70a616de1e6be47fbaeb7ed07d;hpb=6cadda014e92b2cb88656d7cfe8e1135a544a7dd;p=sxemacs

diff --git a/Makefile.am b/Makefile.am
index 8f04c9d..5651add 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,8 @@ sxe_subdirs += lib-src
 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 =
@@ -113,8 +115,8 @@ $(ETAGS):
 .PHONY: stage1 stage2 build-report time-build-report time-check beta
 ## Convenience target for SXEmacs beta testers
 beta:
-	$(MAKE) -w $(MAKEFLAGS) clean
-	$(MAKE) -w $(MAKEFLAGS) all
+	$(MAKE) $(AM_MAKEFLAGS) clean
+	$(MAKE) $(AM_MAKEFLAGS) all
 	@ 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:
-	(time $(MAKE) -w $(MAKEFLAGS) beta )2>&1 | tee ,,beta.out
+	(time $(MAKE) $(AM_MAKEFLAGS) beta )2>&1 | tee ,,beta.out
 
 time-all:
-	time $(MAKE) -w $(MAKEFLAGS) all
+	time $(MAKE) $(AM_MAKEFLAGS) all
 
 time-check:
-	(time $(MAKE) -w $(MAKEFLAGS) check ) 2>&1 | tee ,,make-check.out
+	(time $(MAKE) $(AM_MAKEFLAGS) check ) 2>&1 | tee ,,make-check.out
 
 build-report: env-report
-	$(MAKE) -w $(MAKEFLAGS) beta 2>&1 | tee ,,beta.out
+	$(MAKE) $(AM_MAKEFLAGS) beta 2>&1 | tee ,,beta.out
 	@ [ -f ,,build.done ] || exit 1
 	$(MAKE) -w $(MAKEFLAGS) check 2>&1 | tee ,,make-check.out
 
 time-build-report: env-report
-	(time $(MAKE) -w $(MAKEFLAGS) beta ) 2>&1 | tee ,,beta.out
+	$(MAKE) $(AM_MAKEFLAGS) time-beta
 	@ [ -f ,,build.done ] || exit 1
-	(time $(MAKE) -w $(MAKEFLAGS) check ) 2>&1 | tee ,,make-check.out
+	$(MAKE) $(AM_MAKEFLAGS) time-check 
 
 stage1:
 	@echo