1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index d5cee966eb97..f90fc9949fd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@
 atf_aclocal_DATA =
 BUILT_SOURCES =
 CLEANFILES =
+DIST_HOOKS =
 EXTRA_DIST =
 bin_PROGRAMS =
 dist_man_MANS =
@@ -54,10 +55,7 @@ include doc/Makefile.am.inc
 include test-programs/Makefile.am.inc
 
 if ENABLE_TOOLS
-include atf-report/Makefile.am.inc
-include atf-config/Makefile.am.inc
-include atf-run/Makefile.am.inc
-include atf-version/Makefile.am.inc
+include tools/Makefile.am.inc
 endif
 
 #
@@ -126,7 +124,7 @@ BUILD_SH_TP = \
 # Custom targets.
 #
 
-dist-hook: forbid-dist
+DIST_HOOKS += forbid-dist
 if ENABLE_TOOLS
 forbid-dist:
 	@true
@@ -151,4 +149,6 @@ release-test:
 
 .PHONY: $(PHONY_TARGETS)
 
+dist-hook: $(DIST_HOOKS)
+
 # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8