mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 23:45:27 +00:00
Code Issues Releases Wiki Activity

[5210] Put KEA_SHELL option in parent

Browse Source
This commit is contained in:
Francis Dupont
2017-09-29 17:12:55 +02:00
parent cdfbc19538
commit e620bcab06
3 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/Makefile.am
View File

@@ -1,4 +1,8 @@
# The following build order must be maintained. # 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 check-recursive: all-recursive

14
src/bin/shell/Makefile.am
View File

@@ -1,26 +1,14 @@
SUBDIRS = . tests 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 pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py
sbin_SCRIPTS = kea-shell 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 CLEANFILES = *.pyc
man_MANS = kea-shell.8 man_MANS = kea-shell.8
DISTCLEANFILES = $(man_MANS) DISTCLEANFILES = $(man_MANS)
EXTRA_DIST += $(man_MANS) kea-shell.xml EXTRA_DIST = $(man_MANS) kea-shell.xml
if GENERATE_DOCS if GENERATE_DOCS
kea-shell.8: kea-shell.xml kea-shell.8: kea-shell.xml

20
src/bin/shell/tests/Makefile.am
View File

@@ -1,12 +1,5 @@
PYTESTS = PYTESTS = shell_unittest.py
SHTESTS = SHTESTS = shell_process_tests.sh
EXTRA_DIST =
if KEA_SHELL
# Ok, shell is enabled. Let's run those tests.
PYTESTS += shell_unittest.py
SHTESTS += shell_process_tests.sh
noinst_SCRIPTS = $(PYTESTS) $(SHTESTS) noinst_SCRIPTS = $(PYTESTS) $(SHTESTS)
# test using command-line arguments, so use check-local target instead of TESTS # test using command-line arguments, so use check-local target instead of TESTS
@@ -27,15 +20,6 @@ check-shell:
${SHELL} $(abs_builddir)/$$shtest || exit ; \ ${SHELL} $(abs_builddir)/$$shtest || exit ; \
done 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__ CLEANDIRS = __pycache__
clean-local: clean-local: