Also, move dist of README, NEWS, COPYING to doc makefile so that they are covered by normal install/uninstall in doc directory instead of the overridden ones in root makefile, making distcheck work better.
Signed-off-by: Ben Lipton <[email protected]> --- Makefile.am | 4 +--- doc/Makefile.am | 7 ++++++- p2v-transfer/Makefile.am | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index e342410..9bd97e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,9 +42,7 @@ install-doc: doc check: list='$(parts)'; for dir in $$list; do \ - $(MAKE) -C $$dir check; \ + $(MAKE) -C $$dir check || exit 1; \ done DIST_SUBDIRS = $(parts) - -dist_doc_DATA = COPYING NEWS README diff --git a/doc/Makefile.am b/doc/Makefile.am index cfc8165..497623d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -3,11 +3,16 @@ docrst = \ dochtml = $(docrst:.rst=.html) +docstatic = \ + ../COPYING \ + ../NEWS \ + ../README + if RST2HTML nodist_doc_DATA = $(dochtml) endif -dist_doc_DATA = $(docrst) +dist_doc_DATA = $(docrst) $(docstatic) %.html: %.rst @if test -n "$(RST2HTML)"; then\ diff --git a/p2v-transfer/Makefile.am b/p2v-transfer/Makefile.am index 1348145..cae677c 100644 --- a/p2v-transfer/Makefile.am +++ b/p2v-transfer/Makefile.am @@ -1,14 +1,17 @@ -dist_sbin_SCRIPTS = # coming soon +dist_sbin_SCRIPTS = \ + p2v_transfer.py EXTRA_DIST = \ $(dist_TESTS) \ $(test_extras) # Testing python scripts -dist_TESTS = # coming soon +dist_TESTS = \ + test/p2v_transfer_test.py test_extras = # coming soon srcdir = @abs_srcdir@ TESTS = $(dist_TESTS) TESTS_ENVIRONMENT = \ PYTHONPATH=$(srcdir) SRCDIR=$(srcdir) + -- 1.7.3.1
