Commit bf289fc6 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[1451] fixes for distcheck

parent 3dbb7c07
...@@ -14,8 +14,9 @@ CLEANFILES = b10-ddns ddns.pyc ddns.spec ...@@ -14,8 +14,9 @@ CLEANFILES = b10-ddns ddns.pyc ddns.spec
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.pyc CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.pyc
EXTRA_DIST = ddns_messages.mes
#man_MANS = b10-ddns.8 #man_MANS = b10-ddns.8
#EXTRA_DIST = $(man_MANS) b10-ddns.xml ddns_messages.mes #EXTRA_DIST += $(man_MANS) b10-ddns.xml
if ENABLE_MAN if ENABLE_MAN
......
PYCOVERAGE_RUN=@PYCOVERAGE_RUN@ PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = ddns_test.py PYTESTS = ddns_test.py
noinst_SCRIPTS = $(PYTESTS) EXTRA_DIST = $(PYTESTS)
# If necessary (rare cases), explicitly specify paths to dynamic libraries # If necessary (rare cases), explicitly specify paths to dynamic libraries
# required by loadable python modules. # required by loadable python modules.
...@@ -20,10 +20,9 @@ if ENABLE_PYTHON_COVERAGE ...@@ -20,10 +20,9 @@ if ENABLE_PYTHON_COVERAGE
endif endif
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
chmod +x $(abs_builddir)/$$pytest ; \
B10_FROM_BUILD=$(abs_top_builddir) \ B10_FROM_BUILD=$(abs_top_builddir) \
$(LIBRARY_PATH_PLACEHOLDER) \ $(LIBRARY_PATH_PLACEHOLDER) \
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/ddns:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/util/io/.libs \ PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/ddns:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/util/io/.libs \
TESTDATASRCDIR=$(abs_srcdir)/testdata/ \ TESTDATASRCDIR=$(abs_srcdir)/testdata/ \
$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done done
...@@ -3,6 +3,7 @@ SUBDIRS = work ...@@ -3,6 +3,7 @@ SUBDIRS = work
EXTRA_DIST = __init__.py EXTRA_DIST = __init__.py
EXTRA_DIST += bind10_messages.py EXTRA_DIST += bind10_messages.py
EXTRA_DIST += cmdctl_messages.py EXTRA_DIST += cmdctl_messages.py
EXTRA_DIST += ddns_messages.py
EXTRA_DIST += stats_messages.py EXTRA_DIST += stats_messages.py
EXTRA_DIST += stats_httpd_messages.py EXTRA_DIST += stats_httpd_messages.py
EXTRA_DIST += xfrin_messages.py EXTRA_DIST += xfrin_messages.py
...@@ -16,6 +17,7 @@ EXTRA_DIST += libxfrin_messages.py ...@@ -16,6 +17,7 @@ EXTRA_DIST += libxfrin_messages.py
CLEANFILES = __init__.pyc CLEANFILES = __init__.pyc
CLEANFILES += bind10_messages.pyc CLEANFILES += bind10_messages.pyc
CLEANFILES += cmdctl_messages.pyc CLEANFILES += cmdctl_messages.pyc
CLEANFILES += ddns_messages.pyc
CLEANFILES += stats_messages.pyc CLEANFILES += stats_messages.pyc
CLEANFILES += stats_httpd_messages.pyc CLEANFILES += stats_httpd_messages.pyc
CLEANFILES += xfrin_messages.pyc CLEANFILES += xfrin_messages.pyc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment