[master] Merging trac5266 (make (dist)clean)

20 files changed, 41 insertions, 8 deletions

diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am
index a71ee1c737..1de129ada3 100644
--- a/src/bin/admin/Makefile.am
+++ b/src/bin/admin/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . tests
 sbin_SCRIPTS  = kea-admin
 
 man_MANS = kea-admin.8
-DISTCLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(sbin_SCRIPTS) $(man_MANS)
 EXTRA_DIST = $(man_MANS) kea-admin.xml admin-utils.sh
 
 if GENERATE_DOCS
diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am
index 94e8d941fc..ebea0cf8f0 100644
--- a/src/bin/agent/tests/Makefile.am
+++ b/src/bin/agent/tests/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/agent\"
 
 CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
 
-DISTCLEANFILES = ca_process_tests.sh
+DISTCLEANFILES = ca_process_tests.sh test_data_files_config.h test_libraries.h
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am
index 67b9e0b219..ffd0f060c6 100644
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/ddns\"
 
 CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
 
-DISTCLEANFILES = d2_process_tests.sh
+DISTCLEANFILES = d2_process_tests.sh test_data_files_config.h
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index c75a39a21d..18644e9af8 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -23,7 +23,7 @@ endif
 CLEANFILES  = *.gcno *.gcda spec_config.h dhcp4_messages.h dhcp4_messages.cc s-messages
 
 man_MANS = kea-dhcp4.8
-DISTCLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(man_MANS) spec_config.h.pre
 EXTRA_DIST = $(man_MANS) kea-dhcp4.xml dhcp4.spec
 EXTRA_DIST += dhcp4.dox dhcp4_hooks.dox dhcp4o6.dox
 EXTRA_DIST += dhcp4_parser.yy
diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 4a82bc66ae..75e2074abe 100644
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -30,7 +30,8 @@ CLEANFILES += $(builddir)/load_marker.txt $(builddir)/unload_marker.txt
 CLEANFILES += $(builddir)/test_leases.csv.*
 CLEANFILES += *.json *.log
 
-DISTCLEANFILES = dhcp4_process_tests.sh
+DISTCLEANFILES = dhcp4_process_tests.sh marker_file.h
+DISTCLEANFILES += test_data_files_config.h test_libraries.h
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index d798e81ffb..9db0811937 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -23,7 +23,7 @@ endif
 CLEANFILES = spec_config.h dhcp6_messages.h dhcp6_messages.cc s-messages
 
 man_MANS = kea-dhcp6.8
-DISTCLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(man_MANS) spec_config.h.pre
 EXTRA_DIST = $(man_MANS) kea-dhcp6.xml dhcp6.spec
 EXTRA_DIST += dhcp6.dox dhcp6_hooks.dox dhcp4o6.dox
 EXTRA_DIST += dhcp6_parser.yy
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index f0b8d219c8..130646d285 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -31,7 +31,8 @@ CLEANFILES += $(builddir)/load_marker.txt $(builddir)/unload_marker.txt
 CLEANFILES += $(builddir)/test_leases.csv.*
 CLEANFILES += *.json *.log
 
-DISTCLEANFILES = dhcp6_process_tests.sh
+DISTCLEANFILES = dhcp6_process_tests.sh marker_file.h
+DISTCLEANFILES += test_data_files_config.h test_libraries.h
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/shell/Makefile.am b/src/bin/shell/Makefile.am
index 347085ba84..29bae0f71e 100644
--- a/src/bin/shell/Makefile.am
+++ b/src/bin/shell/Makefile.am
@@ -7,7 +7,7 @@ sbin_SCRIPTS = kea-shell
 CLEANFILES = *.pyc
 
 man_MANS = kea-shell.8
-DISTCLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(sbin_SCRIPTS) $(man_MANS)
 EXTRA_DIST = $(man_MANS) kea-shell.xml
 
 if GENERATE_DOCS
diff --git a/src/bin/shell/tests/Makefile.am b/src/bin/shell/tests/Makefile.am
index 16731611fa..e9b550eb64 100644
--- a/src/bin/shell/tests/Makefile.am
+++ b/src/bin/shell/tests/Makefile.am
@@ -2,6 +2,8 @@ PYTESTS = shell_unittest.py
 SHTESTS = shell_process_tests.sh
 noinst_SCRIPTS = $(PYTESTS) $(SHTESTS)
 
+DISTCLEANFILES = shell_process_tests.sh shell_unittest.py
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local: check-shell check-python
 
diff --git a/src/hooks/dhcp/user_chk/tests/Makefile.am b/src/hooks/dhcp/user_chk/tests/Makefile.am
index fe1960d745..f2c7073bea 100644
--- a/src/hooks/dhcp/user_chk/tests/Makefile.am
+++ b/src/hooks/dhcp/user_chk/tests/Makefile.am
@@ -18,6 +18,7 @@ endif
 EXTRA_DIST = test_users_1.txt test_users_err.txt
 
 CLEANFILES = *.gcno *.gcda
+DISTCLEANFILES = test_data_files_config.h
 
 TESTS_ENVIRONMENT = \
 	$(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index d2b6bbe160..e46eef9bb4 100644
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -11,6 +11,7 @@ AM_LDFLAGS = -static
 endif
 
 CLEANFILES = *.gcno *.gcda
+DISTCLEANFILES = data_def_unittests_config.h
 
 TESTS_ENVIRONMENT = \
 	$(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 88e2f6511f..342ed921d8 100644
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -15,6 +15,7 @@ AM_LDFLAGS = -static
 endif
 
 CLEANFILES = *.gcno *.gcda
+DISTCLEANFILES = test_libraries.h
 
 TESTS_ENVIRONMENT = \
         $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index ac80a93d93..78c9cf1397 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -13,6 +13,8 @@ CLEANFILES += s-rdatacode
 CLEANFILES += python/rrtype_constants_inc.cc
 CLEANFILES += python/rrclass_constants_inc.cc
 
+DISTCLEANFILES = gen-rdatacode.py
+
 EXTRA_DIST = rrclass-placeholder.h
 EXTRA_DIST += rrparamregistry-placeholder.cc
 EXTRA_DIST += rrtype-placeholder.h
diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am
index d9016a6565..70d22497a6 100644
--- a/src/lib/hooks/tests/Makefile.am
+++ b/src/lib/hooks/tests/Makefile.am
@@ -17,6 +17,9 @@ ALL_LIBS       = $(HOOKS_LIB) $(LOG_LIB) $(THREADS_LIB) $(UTIL_LIB) $(EXCEPTIONS
 # Files to clean include the file created by testing.
 CLEANFILES = *.gcno *.gcda $(builddir)/marker_file.dat
 
+# Files generated by configure
+DISTCLEANFILES = marker_file.h test_libraries.h
+
 TESTS_ENVIRONMENT = \
 	$(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
 
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 03806f987e..bf601db4ee 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -11,6 +11,10 @@ AM_LDFLAGS += -static
 endif
 
 CLEANFILES = *.gcno *.gcda *.lock
+DISTCLEANFILES = buffer_logger_test.sh
+DISTCLEANFILES += console_test.sh destination_test.sh init_logger_test.sh
+DISTCLEANFILES += local_file_test.sh logger_lock_test.sh severity_test.sh
+DISTCLEANFILES += tempdir.h
 
 EXTRA_DIST = log_test_messages.mes
 BUILT_SOURCES = log_test_messages.h log_test_messages.cc
diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am
index 7f1ca9b80e..1f918f44ea 100644
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@ -35,6 +35,9 @@ EXTRA_DIST = process_messages.mes libprocess.dox
 # Get rid of generated message files on a clean
 CLEANFILES = *.gcno *.gcda spec_config.h process_messages.h process_messages.cc s-messages
 
+# Generated by configure files
+DISTCLEANFILES = spec_config.h.pre
+
 lib_LTLIBRARIES = libkea-process.la
 libkea_process_la_SOURCES  = d_cfg_mgr.cc d_cfg_mgr.h
 libkea_process_la_SOURCES += d_controller.cc d_controller.h
diff --git a/src/lib/util/python/Makefile.am b/src/lib/util/python/Makefile.am
index dd584be2b2..460bf1aa00 100644
--- a/src/lib/util/python/Makefile.am
+++ b/src/lib/util/python/Makefile.am
@@ -1,2 +1,3 @@
 noinst_SCRIPTS = const2hdr.py gen_wiredata.py
 EXTRA_DIST = const2hdr.py
+DISTCLEANFILES = gen_wiredata.py
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 6bd1727ffb..301d94f2bb 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -17,6 +17,8 @@ CLEANFILES = *.gcno *.gcda
 # CSV files are created by unit tests for CSVFile class.
 CLEANFILES += *.csv
 
+DISTCLEANFILES = process_spawn_app.sh
+
 noinst_SCRIPTS = process_spawn_app.sh
 
 TESTS_ENVIRONMENT = \
diff --git a/src/share/database/scripts/mysql/Makefile.am b/src/share/database/scripts/mysql/Makefile.am
index dea04b2df2..2469328d04 100644
--- a/src/share/database/scripts/mysql/Makefile.am
+++ b/src/share/database/scripts/mysql/Makefile.am
@@ -11,4 +11,11 @@ sqlscripts_DATA += upgrade_4.1_to_5.0.sh
 sqlscripts_DATA += upgrade_5.0_to_5.1.sh
 
 
+DISTCLEANFILES = upgrade_1.0_to_2.0.sh
+DISTCLEANFILES += upgrade_2.0_to_3.0.sh
+DISTCLEANFILES += upgrade_3.0_to_4.0.sh
+DISTCLEANFILES += upgrade_4.0_to_4.1.sh
+DISTCLEANFILES += upgrade_4.1_to_5.0.sh
+DISTCLEANFILES += upgrade_5.0_to_5.1.sh
+
 EXTRA_DIST = ${sqlscripts_DATA}
diff --git a/src/share/database/scripts/pgsql/Makefile.am b/src/share/database/scripts/pgsql/Makefile.am
index e3c27f8020..d8df955df2 100644
--- a/src/share/database/scripts/pgsql/Makefile.am
+++ b/src/share/database/scripts/pgsql/Makefile.am
@@ -7,4 +7,8 @@ sqlscripts_DATA += upgrade_1.0_to_2.0.sh
 sqlscripts_DATA += upgrade_2.0_to_3.0.sh
 sqlscripts_DATA += upgrade_3.0_to_3.1.sh
 
+DISTCLEANFILES = upgrade_1.0_to_2.0.sh
+DISTCLEANFILES += upgrade_2.0_to_3.0.sh
+DISTCLEANFILES += upgrade_3.0_to_3.1.s
+
 EXTRA_DIST = ${sqlscripts_DATA}