[1101] use pre-generated forwarding .py files under log_messages srcdir

instead of dynamically creating them so that all of in-src separate-builddir
and distcheck will succeed.

configure.ac

@@ -953,7 +953,6 @@ AC_OUTPUT([doc/version.ent
            src/lib/python/isc/cc/tests/cc_test
            src/lib/python/isc/notify/tests/notify_out_test
            src/lib/python/isc/log/tests/log_console.py
-           src/lib/python/isc/log_messages/__init__.py
            src/lib/python/isc/log_messages/work/__init__.py
            src/lib/dns/gen-rdatacode.py
            src/lib/python/bind10_config.py

src/bin/bind10/Makefile.am

@@ -19,8 +19,6 @@ EXTRA_DIST = bob.spec
 man_MANS = bind10.8
 EXTRA_DIST += $(man_MANS) bind10.xml bind10_messages.mes
 
-BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/bind10_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/bind10_messages.py
 CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/bind10_messages.pyc
 EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/bind10_messages.py
 
@@ -35,9 +33,6 @@ $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py : bind10_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/bind10_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/bind10_messages.py: Makefile
-	echo "from work.bind10_messages import *" > $@
-
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 bind10: bind10_src.py $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \

src/bin/cmdctl/Makefile.am

@@ -25,11 +25,6 @@ CLEANFILES= b10-cmdctl cmdctl.pyc cmdctl.spec
 CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py
 CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.pyc
 
-BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/cmdctl_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/cmdctl_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/cmdctl_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/cmdctl_messages.py
-
 man_MANS = b10-cmdctl.8
 EXTRA_DIST += $(man_MANS) b10-cmdctl.xml cmdctl_messages.mes
 
@@ -47,9 +42,6 @@ $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py : cmdctl_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/cmdctl_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/cmdctl_messages.py: Makefile
-	echo "from work.cmdctl_messages import *" > $@
-
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-cmdctl: cmdctl.py $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@

src/bin/stats/Makefile.am

@@ -25,16 +25,6 @@ EXTRA_DIST += stats.spec stats-httpd.spec stats-schema.spec
 EXTRA_DIST += stats-httpd-xml.tpl stats-httpd-xsd.tpl stats-httpd-xsl.tpl
 EXTRA_DIST += stats_messages.mes stats_httpd_messages.mes
 
-BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/stats_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/stats_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/stats_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/stats_messages.py
-
-BUILT_SOURCES += $(PYTHON_LOGMSGPKG_DIR)/stats_httpd_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/stats_httpd_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/stats_httpd_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/stats_httpd_messages.py
-
 if ENABLE_MAN
 
 b10-stats.8: b10-stats.xml
@@ -49,16 +39,10 @@ $(PYTHON_LOGMSGPKG_DIR)/work/stats_messages.py : stats_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/stats_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/stats_messages.py: Makefile
-	echo "from work.stats_messages import *" > $@
-
 $(PYTHON_LOGMSGPKG_DIR)/work/stats_httpd_messages.py : stats_httpd_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/stats_httpd_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/stats_httpd_messages.py: Makefile
-	echo "from work.stats_httpd_messages import *" > $@
-
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-stats: stats.py $(PYTHON_LOGMSGPKG_DIR)/work/stats_messages.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|"  stats.py >$@

src/bin/xfrin/Makefile.am

@@ -18,11 +18,6 @@ man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
 EXTRA_DIST += xfrin.spec xfrin_messages.mes
 
-BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/xfrin_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/xfrin_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/xfrin_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/xfrin_messages.py
-
 if ENABLE_MAN
 
 b10-xfrin.8: b10-xfrin.xml
@@ -35,9 +30,6 @@ $(PYTHON_LOGMSGPKG_DIR)/work/xfrin_messages.py : xfrin_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/xfrin_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/xfrin_messages.py: Makefile
-	echo "from work.xfrin_messages import *" > $@
-
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-xfrin: xfrin.py $(PYTHON_LOGMSGPKG_DIR)/work/xfrin_messages.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \

src/bin/xfrout/Makefile.am

@@ -17,11 +17,6 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrout_messages.pyc
 man_MANS = b10-xfrout.8
 EXTRA_DIST = $(man_MANS) b10-xfrout.xml xfrout_messages.mes
 
-BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/xfrout_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/xfrout_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/xfrout_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/xfrout_messages.py
-
 if ENABLE_MAN
 
 b10-xfrout.8: b10-xfrout.xml
@@ -34,9 +29,6 @@ $(PYTHON_LOGMSGPKG_DIR)/work/xfrout_messages.py : xfrout_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/xfrout_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/xfrout_messages.py: Makefile
-	echo "from work.xfrout_messages import *" > $@
-
 xfrout.spec: xfrout.spec.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.spec.pre >$@
 

src/bin/zonemgr/Makefile.am

@@ -17,11 +17,6 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/zonemgr_messages.pyc
 man_MANS = b10-zonemgr.8
 EXTRA_DIST = $(man_MANS) b10-zonemgr.xml zonemgr_messages.mes
 
-BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/zonemgr_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/zonemgr_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/zonemgr_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/zonemgr_messages.py
-
 if ENABLE_MAN
 
 b10-zonemgr.8: b10-zonemgr.xml
@@ -34,9 +29,6 @@ $(PYTHON_LOGMSGPKG_DIR)/work/zonemgr_messages.py : zonemgr_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/zonemgr_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/zonemgr_messages.py: Makefile
-	echo "from work.zonemgr_messages import *" > $@
-
 zonemgr.spec: zonemgr.spec.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" zonemgr.spec.pre >$@
 

src/lib/python/isc/config/Makefile.am

@@ -18,30 +18,14 @@ CLEANDIRS = __pycache__
 
 EXTRA_DIST = cfgmgr_messages.mes config_messages.mes
 
-BUILT_SOURCES += $(PYTHON_LOGMSGPKG_DIR)/cfgmgr_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/cfgmgr_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/cfgmgr_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/cfgmgr_messages.py
-
-BUILT_SOURCES += $(PYTHON_LOGMSGPKG_DIR)/config_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/config_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/config_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/config_messages.py
-
 # Define rule to build logging source files from message file
 $(PYTHON_LOGMSGPKG_DIR)/work/cfgmgr_messages.py : cfgmgr_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/cfgmgr_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/cfgmgr_messages.py: Makefile
-	echo "from work.cfgmgr_messages import *" > $@
-
 $(PYTHON_LOGMSGPKG_DIR)/work/config_messages.py : config_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/config_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/config_messages.py: Makefile
-	echo "from work.config_messages import *" > $@
-
 clean-local:
 	rm -rf $(CLEANDIRS)

src/lib/python/isc/log_messages/Makefile.am

@@ -1,7 +1,28 @@
 SUBDIRS = work
 
 EXTRA_DIST = __init__.py
+EXTRA_DIST += bind10_messages.py
+EXTRA_DIST += cmdctl_messages.py
+EXTRA_DIST += stats_messages.py
+EXTRA_DIST += stats_httpd_messages.py
+EXTRA_DIST += xfrin_messages.py
+EXTRA_DIST += xfrout_messages.py
+EXTRA_DIST += zonemgr_messages.py
+EXTRA_DIST += cfgmgr_messages.py
+EXTRA_DIST += config_messages.py
+EXTRA_DIST += notify_out_messages.py
+
 CLEANFILES = __init__.pyc
+CLEANFILES += bind10_messages.pyc
+CLEANFILES += cmdctl_messages.pyc
+CLEANFILES += stats_messages.pyc
+CLEANFILES += stats_httpd_messages.pyc
+CLEANFILES += xfrin_messages.pyc
+CLEANFILES += xfrout_messages.pyc
+CLEANFILES += zonemgr_messages.pyc
+CLEANFILES += cfgmgr_messages.pyc
+CLEANFILES += config_messages.pyc
+CLEANFILES += notify_out_messages.pyc
 
 CLEANDIRS = __pycache__
 

src/lib/python/isc/log_messages/bind10_messages.py

@@ -0,0 +1 @@
+from work.bind10_messages import *

src/lib/python/isc/log_messages/cfgmgr_messages.py

@@ -0,0 +1 @@
+from work.cfgmgr_messages import *

src/lib/python/isc/log_messages/cmdctl_messages.py

@@ -0,0 +1 @@
+from work.cmdctl_messages import *

src/lib/python/isc/log_messages/config_messages.py

@@ -0,0 +1 @@
+from work.config_messages import *

src/lib/python/isc/log_messages/notify_out_messages.py

@@ -0,0 +1 @@
+from work.notify_out_messages import *

src/lib/python/isc/log_messages/stats_httpd_messages.py

@@ -0,0 +1 @@
+from work.stats_httpd_messages import *

src/lib/python/isc/log_messages/stats_messages.py

@@ -0,0 +1 @@
+from work.stats_messages import *

src/lib/python/isc/log_messages/xfrin_messages.py

@@ -0,0 +1 @@
+from work.xfrin_messages import *

src/lib/python/isc/log_messages/xfrout_messages.py

@@ -0,0 +1 @@
+from work.xfrout_messages import *

src/lib/python/isc/log_messages/zonemgr_messages.py

@@ -0,0 +1 @@
+from work.zonemgr_messages import *

src/lib/python/isc/notify/Makefile.am

@@ -9,12 +9,7 @@ pylogmessagedir = $(pyexecdir)/isc/log_messages/
 
 EXTRA_DIST = notify_out_messages.mes
 
-BUILT_SOURCES += $(PYTHON_LOGMSGPKG_DIR)/notify_out_messages.py
-CLEANFILES = $(PYTHON_LOGMSGPKG_DIR)/notify_out_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/notify_out_messages.pyc
-EXTRA_DIST += $(PYTHON_LOGMSGPKG_SRCDIR)/notify_out_messages.py
-
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/notify_out_messages.py
+CLEANFILES = $(PYTHON_LOGMSGPKG_DIR)/work/notify_out_messages.py
 CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/notify_out_messages.pyc
 
 CLEANDIRS = __pycache__
@@ -23,8 +18,5 @@ $(PYTHON_LOGMSGPKG_DIR)/work/notify_out_messages.py : notify_out_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message \
 	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/notify_out_messages.mes
 
-$(PYTHON_LOGMSGPKG_DIR)/notify_out_messages.py: Makefile
-	echo "from work.notify_out_messages import *" > $@
-
 clean-local:
 	rm -rf $(CLEANDIRS)