[Makefile.am] Add $(AM_MAKEFLAGS) to recursive make invocations

3 files changed, 18 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index 31f8134d..09f823a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,17 @@
 DIST_SUBDIRS = pixman src test doc
 SUBDIRS = pixman src doc
 
-.PHONY: doc test
+.PHONY: doc test retest recheck check-valgrind
 doc:
-	-$(MAKE) -C doc doc
+	cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
 test: all
-	-$(MAKE) -C test test
+	cd test && $(MAKE) $(AM_MAKEFLAGS) test
 retest: all
-	-$(MAKE) -C test retest
+	cd test && $(MAKE) $(AM_MAKEFLAGS) retest
 recheck: all
-	-$(MAKE) -C test recheck
+	cd test && $(MAKE) $(AM_MAKEFLAGS) recheck
+check-valgrind: all
+	cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
 
 # libpng is required for our test programs
 if CAIRO_HAS_PNG_FUNCTIONS
@@ -36,9 +38,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/mkinstalldirs \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-check-valgrind: all
-	$(MAKE) -C test check-valgrind
-
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 # Creating ChangeLog files from git log:
@@ -67,7 +66,7 @@ MAINTAINERCLEANFILES += $(srcdir)/ChangeLog $(srcdir)/ChangeLog.pre-*
 DISTCLEANFILES += $(srcdir)/ChangeLog.cache-*
 
 changelogs:
-	@$(MAKE) $(CHANGELOGS)
+	@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
 
 dist-hook: changelogs
 	changelogs="$(CHANGELOGS)"; \
@@ -83,7 +82,7 @@ $(srcdir)/ChangeLog:
 		nearest_tag=`git-describe | sed 's/-[^-]*//'`; \
 		before=$(srcdir)/ChangeLog.cache-$$prev..$$nearest_tag; \
 		after=$(srcdir)/ChangeLog.cache-$$nearest_tag..; \
-		$(MAKE) $$before $$after && \
+		$(MAKE) $(AM_MAKEFLAGS) $$before $$after && \
 		echo Creating $@ && \
 		{ cat $$after; echo; cat $$before; } > $@; \
 	else \
@@ -266,4 +265,4 @@ docs-publish: all
 	scp $(MANUAL_TAR_FILE) $(RELEASE_UPLOAD_HOST):$(MANUAL_UPLOAD_DIR)
 	ssh $(RELEASE_UPLOAD_HOST) "cd $(MANUAL_UPLOAD_DIR) && tar xzf $(MANUAL_TAR_FILE) && rm -f manual && ln -s $(MANUAL_DATED) manual && ln -sf $(MANUAL_TAR_FILE) cairo-manual.tar.gz"
 
-.PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish docs-publish test retest recheck
+.PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish docs-publish
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 74d82988..4bca815b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS=public
 .PHONY: doc
 doc:
-	-$(MAKE) -C public doc
+	cd public && $(MAKE) $(AM_MAKEFLAGS) public doc
diff --git a/test/Makefile.am b/test/Makefile.am
index 7a40739e..7342391d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -448,7 +448,7 @@ CLEANFILES =					\
 # Check tests under valgrind
 # Saves log to valgrind-log
 check-valgrind:
-	$(MAKE) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) $(top_srcdir)/libtool --mode=execute valgrind --tool=memcheck --suppressions=./.valgrind-suppressions --leak-check=yes --show-reachable=yes' 2>&1 | tee valgrind-log
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) $(top_srcdir)/libtool --mode=execute valgrind --tool=memcheck --suppressions=./.valgrind-suppressions --leak-check=yes --show-reachable=yes' 2>&1 | tee valgrind-log
 
 # The following definitions both should work.
 #FAILED_TESTS = `grep -l '\<FAIL\>' $(TESTS:=.log) 2>/dev/null | sed -e 's/[.]log$$//' | xargs echo`
@@ -459,20 +459,20 @@ recheck = check TESTS="$(FAILED_TESTS)"
 # Re-checks all failed tests, i.e. tests with a log file that has a failure
 recheck:
 	@echo Re-checking failed tests
-	@$(MAKE) $(recheck)
+	@$(MAKE) $(AM_MAKEFLAGS) $(recheck)
 
 # Checks tests and creates index.html.
 # Target doesn't fail if tests fail.
 test:
-	@$(MAKE) check; \
-	$(MAKE) html
+	@$(MAKE) $(AM_MAKEFLAGS) check; \
+	$(MAKE) $(AM_MAKEFLAGS) html
 
 # Re-checks tests and creates index.html.
 # Target doesn't fail if tests fail.
 retest:
 	@TESTS="$(FAILED_TESTS)"; \
-	$(MAKE) TESTS="$$TESTS" check; \
-	$(MAKE) TESTS="$$TESTS" html
+	$(MAKE) $(AM_MAKEFLAGS) TESTS="$$TESTS" check; \
+	$(MAKE) $(AM_MAKEFLAGS) TESTS="$$TESTS" html
 
 # Make index.html with no dependency tracking.
 html:
@@ -481,7 +481,7 @@ html:
 
 # Make index.html with no dependency tracking, containing only the failed tests.
 rehtml:
-	@$(MAKE) TESTS="$(FAILED_TESTS)" html
+	@$(MAKE) $(AM_MAKEFLAGS) TESTS="$(FAILED_TESTS)" html
 
 $(TESTS): $(SUPPORT_PROGS)