Merge pull request #402 from orlitzky/fix-distclean

Fix distcheck

Author: thegushi

Makefile.am

@@ -72,6 +72,8 @@ $(nodist_doc_DATA): $(doc_DATA_intermediate) $(EXTRA_DIST) Makefile
 	  $(edit) $${srcdir}$@.in > $@.tmp
 	mv $@.tmp $@
 
+# Ensure that anything we build is cleaned up.
+CLEANFILES = $(nodist_doc_DATA)
 
 $(DIST_ARCHIVES): distcheck
 

libopendkim/tests/Makefile.am

@@ -53,17 +53,18 @@ if ALL_SYMBOLS
 check_PROGRAMS += t-test49 t-test113 t-test118
 endif
 
-check_DATA = testkeys
-CLEANFILES = $(check_DATA)
-
 # The path "./testkeys" is hard-coded in t-testdata.h
 testkeys: t-setup$(EXEEXT)
 	./t-setup$(EXEEXT)
 
+check_DATA = testkeys
+
 # t-setup needs to run first, before check_PROGRAMS. Put it in
 # EXTRA_PROGRAMS so automake will still build it on demand.
 EXTRA_PROGRAMS = t-setup
 
+CLEANFILES = $(check_DATA) $(EXTRA_PROGRAMS)
+
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
 EXTRA_DIST = $(check_SCRIPTS) t-sha1.h