Browse Source

[trac710] remove __pycache__ directories

introduced in python3.2, this is where .pyc files are now stored, which of course makes distcheck fail. Added cleandir targets to all directories containing python code.
Jelte Jansen 14 years ago
parent
commit
dd3c0d1df4

+ 5 - 0
src/bin/bind10/Makefile.am

@@ -27,3 +27,8 @@ bind10: bind10.py
 
 
 pytest:
 pytest:
 	$(SHELL) tests/bind10_test
 	$(SHELL) tests/bind10_test
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/bindctl/Makefile.am

@@ -25,3 +25,8 @@ bindctl: bindctl_main.py
 	       -e "s|@@SYSCONFDIR@@|@sysconfdir@|" \
 	       -e "s|@@SYSCONFDIR@@|@sysconfdir@|" \
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl_main.py >$@
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl_main.py >$@
 	chmod a+x $@
 	chmod a+x $@
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/cfgmgr/Makefile.am

@@ -28,3 +28,8 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
 	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
 # TODO: permissions handled later
 # TODO: permissions handled later
 
 
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/cfgmgr/plugins/Makefile.am

@@ -4,3 +4,8 @@ EXTRA_DIST += logging.spec b10logging.py
 
 
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugin_DATA = tsig_keys.py tsig_keys.spec
 config_plugin_DATA = tsig_keys.py tsig_keys.spec
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/cfgmgr/tests/Makefile.am

@@ -16,3 +16,8 @@ endif
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cfgmgr \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cfgmgr \
 	$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
 	$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
 	done
 	done
+
+CLEANDIRS = testdata/plugins/__pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/cmdctl/Makefile.am

@@ -51,3 +51,8 @@ install-data-local:
 	done
 	done
 
 
 endif
 endif
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/msgq/Makefile.am

@@ -20,3 +20,8 @@ endif
 b10-msgq: msgq.py
 b10-msgq: msgq.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" msgq.py >$@
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" msgq.py >$@
 	chmod a+x $@
 	chmod a+x $@
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/stats/Makefile.am

@@ -34,3 +34,8 @@ b10-stats: stats.py
 b10-stats-httpd: stats_httpd.py
 b10-stats-httpd: stats_httpd.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" stats_httpd.py >$@
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" stats_httpd.py >$@
 	chmod a+x $@
 	chmod a+x $@
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/stats/tests/Makefile.am

@@ -17,3 +17,8 @@ endif
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done
 	done
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 4 - 0
src/bin/stats/tests/http/Makefile.am

@@ -1,2 +1,6 @@
 EXTRA_DIST = __init__.py server.py
 EXTRA_DIST = __init__.py server.py
 CLEANFILES = __init__.pyc server.pyc
 CLEANFILES = __init__.pyc server.pyc
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/stats/tests/isc/Makefile.am

@@ -1,3 +1,8 @@
 SUBDIRS = cc config util
 SUBDIRS = cc config util
 EXTRA_DIST = __init__.py
 EXTRA_DIST = __init__.py
 CLEANFILES = __init__.pyc
 CLEANFILES = __init__.pyc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/stats/tests/isc/cc/Makefile.am

@@ -1,2 +1,7 @@
 EXTRA_DIST = __init__.py session.py
 EXTRA_DIST = __init__.py session.py
 CLEANFILES = __init__.pyc session.pyc
 CLEANFILES = __init__.pyc session.pyc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/stats/tests/isc/config/Makefile.am

@@ -1,2 +1,7 @@
 EXTRA_DIST = __init__.py ccsession.py
 EXTRA_DIST = __init__.py ccsession.py
 CLEANFILES = __init__.pyc ccsession.pyc
 CLEANFILES = __init__.pyc ccsession.pyc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/stats/tests/isc/util/Makefile.am

@@ -1,2 +1,7 @@
 EXTRA_DIST = __init__.py process.py
 EXTRA_DIST = __init__.py process.py
 CLEANFILES = __init__.pyc process.pyc
 CLEANFILES = __init__.pyc process.pyc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/xfrin/Makefile.am

@@ -25,3 +25,8 @@ b10-xfrin: xfrin.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.py >$@
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.py >$@
 	chmod a+x $@
 	chmod a+x $@
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/xfrout/Makefile.am

@@ -28,3 +28,8 @@ b10-xfrout: xfrout.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.py >$@
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.py >$@
 	chmod a+x $@
 	chmod a+x $@
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/bin/zonemgr/Makefile.am

@@ -26,3 +26,8 @@ b10-zonemgr: zonemgr.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" zonemgr.py >$@
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" zonemgr.py >$@
 	chmod a+x $@
 	chmod a+x $@
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/dns/python/tests/Makefile.am

@@ -41,3 +41,8 @@ endif
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done
 	done
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 4 - 0
src/lib/python/Makefile.am

@@ -11,3 +11,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in bind10_config.py.in
 EXTRA_DIST =  bind10_config.py.in
 EXTRA_DIST =  bind10_config.py.in
 
 
 CLEANFILES = bind10_config.pyc
 CLEANFILES = bind10_config.pyc
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = datasrc cc config log net notify util testutils
 python_PYTHON = __init__.py
 python_PYTHON = __init__.py
 
 
 pythondir = $(pyexecdir)/isc
 pythondir = $(pyexecdir)/isc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/cc/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = . tests
 python_PYTHON =	__init__.py data.py session.py message.py
 python_PYTHON =	__init__.py data.py session.py message.py
 
 
 pythondir = $(pyexecdir)/isc/cc
 pythondir = $(pyexecdir)/isc/cc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/config/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = . tests
 python_PYTHON = __init__.py ccsession.py cfgmgr.py config_data.py module_spec.py
 python_PYTHON = __init__.py ccsession.py cfgmgr.py config_data.py module_spec.py
 
 
 pythondir = $(pyexecdir)/isc/config
 pythondir = $(pyexecdir)/isc/config
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/config/tests/Makefile.am

@@ -18,3 +18,8 @@ endif
 	CONFIG_WR_TESTDATA_PATH=$(abs_top_builddir)/src/lib/config/tests/testdata \
 	CONFIG_WR_TESTDATA_PATH=$(abs_top_builddir)/src/lib/config/tests/testdata \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done
 	done
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/datasrc/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = . tests
 python_PYTHON = __init__.py master.py sqlite3_ds.py
 python_PYTHON = __init__.py master.py sqlite3_ds.py
 
 
 pythondir = $(pyexecdir)/isc/datasrc
 pythondir = $(pyexecdir)/isc/datasrc
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/log/Makefile.am

@@ -6,3 +6,8 @@ pythondir = $(pyexecdir)/isc/log
 
 
 pytest:
 pytest:
 	$(SHELL) tests/log_test
 	$(SHELL) tests/log_test
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/net/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = tests
 python_PYTHON = __init__.py addr.py parse.py
 python_PYTHON = __init__.py addr.py parse.py
 
 
 pythondir = $(pyexecdir)/isc/net
 pythondir = $(pyexecdir)/isc/net
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/notify/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = . tests
 python_PYTHON = __init__.py notify_out.py
 python_PYTHON = __init__.py notify_out.py
 
 
 pythondir = $(pyexecdir)/isc/notify
 pythondir = $(pyexecdir)/isc/notify
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/testutils/Makefile.am

@@ -1 +1,6 @@
 EXTRA_DIST = __init__.py parse_args.py tsigctx_mock.py
 EXTRA_DIST = __init__.py parse_args.py tsigctx_mock.py
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)

+ 5 - 0
src/lib/python/isc/util/Makefile.am

@@ -3,3 +3,8 @@ SUBDIRS = . tests
 python_PYTHON = __init__.py process.py socketserver_mixin.py file.py
 python_PYTHON = __init__.py process.py socketserver_mixin.py file.py
 
 
 pythondir = $(pyexecdir)/isc/util
 pythondir = $(pyexecdir)/isc/util
+
+CLEANDIRS = __pycache__
+
+clean-local:
+	rm -rf $(CLEANDIRS)