[5210] Put KEA_SHELL option in parent

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 9932757890979a02ffea2e95ce261dffdae0defc..67bd58a5c4ff21c9113c0474879a5907772bda18 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,4 +1,8 @@
 # The following build order must be maintained.
-SUBDIRS = dhcp4 dhcp6 d2 agent perfdhcp admin lfc keactrl shell
+SUBDIRS = dhcp4 dhcp6 d2 agent perfdhcp admin lfc keactrl
+
+if KEA_SHELL
+SUBDIRS += shell
+endif
 
 check-recursive: all-recursive

diff --git a/src/bin/shell/Makefile.am b/src/bin/shell/Makefile.am
index 69a1fe49242285f83ef65d6968bf35efff3bdf47..347085ba843bc76615ae380b01610b34a7fddfe3 100644 (file)
--- a/src/bin/shell/Makefile.am
+++ b/src/bin/shell/Makefile.am
@@ -1,26 +1,14 @@
 SUBDIRS = . tests
 
-EXTRA_DIST =
-
-if KEA_SHELL
-
-# Kea-shell is enabled, here are proper rules for it.
 pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py
 
 sbin_SCRIPTS = kea-shell
 
-else
-
-# Kea-shell is disabled, simply keep the files for make dist
-EXTRA_DIST += kea-shell kea_conn.py kea_connector2.py kea_connector3.py
-
-endif
-
 CLEANFILES = *.pyc
 
 man_MANS = kea-shell.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST += $(man_MANS) kea-shell.xml
+EXTRA_DIST = $(man_MANS) kea-shell.xml
 
 if GENERATE_DOCS
 kea-shell.8: kea-shell.xml

diff --git a/src/bin/shell/tests/Makefile.am b/src/bin/shell/tests/Makefile.am
index a0c04ba1bb7dd4547bf9597c9cf810d7f7ba7d91..3b019d32f60de32b2a55e89590828ff7191a9ff3 100644 (file)
--- a/src/bin/shell/tests/Makefile.am
+++ b/src/bin/shell/tests/Makefile.am
@@ -1,12 +1,5 @@
-PYTESTS =
-SHTESTS =
-EXTRA_DIST =
-
-if KEA_SHELL
-
-# Ok, shell is enabled. Let's run those tests.
-PYTESTS += shell_unittest.py
-SHTESTS += shell_process_tests.sh
+PYTESTS = shell_unittest.py
+SHTESTS = shell_process_tests.sh
 noinst_SCRIPTS = $(PYTESTS) $(SHTESTS)
 
 # test using command-line arguments, so use check-local target instead of TESTS
@@ -27,15 +20,6 @@ check-shell:
        ${SHELL} $(abs_builddir)/$$shtest || exit ; \
        done
 
-else
-
-# Nope, shell is disabled. Let's keep the files in EXTRA_DIST, so they get
-# included in make dist, but don't do anything special about them.
-EXTRA_DIST += shell_unittest.py shell_process_tests.sh
-
-endif
-
-
 CLEANDIRS = __pycache__
 
 clean-local: