[libvirt] [PATCH] Don't ship generated python/libvirt.? files.

libvirt.c and libvirt.h are auto-generated files. Mentioning their names in *_SOURCES includes them in the distribution. During an out-of-tree build these shipped files are included instead of the auto-generated version, potentially breaking the build (as it happend in 0.8.0, because the shipped libvirt.h was missing the declaration for 'libvirt_virDomainUpdateDeviceFlags') Use the nodist_*_SOURCES automake variable instead. Signed-off-by: Philipp Hahn <hahn@univention.de> --- python/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

On Thu, Apr 15, 2010 at 12:49:33PM +0200, Philipp Hahn wrote:
libvirt.c and libvirt.h are auto-generated files. Mentioning their names in *_SOURCES includes them in the distribution. During an out-of-tree build these shipped files are included instead of the auto-generated version, potentially breaking the build (as it happend in 0.8.0, because the shipped libvirt.h was missing the declaration for 'libvirt_virDomainUpdateDeviceFlags')
Use the nodist_*_SOURCES automake variable instead.
Signed-off-by: Philipp Hahn <hahn@univention.de> --- python/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/python/Makefile.am b/python/Makefile.am index 6b67e38..eda2866 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -34,7 +34,8 @@ all-local: libvirt.py
pyexec_LTLIBRARIES = libvirtmod.la
-libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h +libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c +nodist_libvirtmod_la_SOURCES = libvirt.c libvirt.h # Python <= 2.4 header files contain a redundant decl, hence we # need extra flags here libvirtmod_la_CFLAGS = $(WARN_PYTHON_CFLAGS)
ACK, I don't know why we've never seen this problem before... Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

On 04/16/2010 05:09 AM, Daniel P. Berrange wrote:
On Thu, Apr 15, 2010 at 12:49:33PM +0200, Philipp Hahn wrote:
libvirt.c and libvirt.h are auto-generated files. Mentioning their names in *_SOURCES includes them in the distribution.
ACK, I don't know why we've never seen this problem before...
It's been a few days since the ACK, so I went ahead and pushed your two patches. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange
-
Eric Blake
-
Philipp Hahn