diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2006-08-11 00:24:01 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2006-08-11 00:24:47 -0400 |
| commit | affc9c71acc1ea206dee0a4056c4f5b307fc7f38 (patch) | |
| tree | f2095cff65a2ff7fd207d088377d73b47914b16b /Makefile.am | |
| parent | c04ccc95fa3cd4272889b1e66e4de5e1bef53ae0 (diff) | |
[Makefile.am] Add $(AM_MAKEFLAGS) to recursive make invocations
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 31f8134df..09f823a02 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 |