Re: [libvirt] [PATCH] Distribute only generated virkeymaps.h

On Tue, Sep 08, 2015 at 03:06:41PM +0200, Martin Kletzander wrote: > We are distributing virkeymaps.h and all the tools needed to rebuild > that file. On top of that, we are generating that file into the > $(srcdir) and that sometimes fails for me when trying to do make dist in > VPATH on rawhide fedora. And we don't clean the file when > maintainer-clean make target is requested. I'd suggest we do the opposite - don't distribute virkeymaps.h - we already require users to have python, so we should be easily able to generate it at build time.

> > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; > --- > src/Makefile.am | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 429137561c6f..c2784af299dc 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -173,15 +173,13 @@ UTIL_SOURCES = \ > $(NULL) > > > -EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ > - $(srcdir)/util/virkeycode-mapgen.py Keep keymaps.csv + virkeycode-mapgen.py > - > BUILT_SOURCES += util/virkeymaps.h > +MAINTAINERCLEANFILES += util/virkeymaps.h Change to CLEANFILES > > util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ > $(srcdir)/util/virkeycode-mapgen.py > $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ > - <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h > + <$(srcdir)/util/keymaps.csv >util/virkeymaps.h > > # Internal generic driver infrastructure > NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|