[libvirt] [PATCH] Distribute only generated virkeymaps.h
Martin Kletzander
mkletzan at redhat.com
Tue Sep 8 16:26:11 UTC 2015
On Tue, Sep 08, 2015 at 02:10:18PM +0100, Daniel P. Berrange wrote:
>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.
>
Oh, I just noticed one thing. Since the virkeymaps.h is mentioned in
the list of files needed for libvirt_util sources, well basically
*any* file being built, it will get generated anyway. So in this case
there is no point in regenerating it. And it won't regenerate when
it's not needed, so I would keep the patch as it is.
>>
>> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>> ---
>> 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 :|
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150908/b0b69a66/attachment-0001.sig>
More information about the libvir-list
mailing list