On Fri, Apr 07, 2017 at 05:52:50PM +0200, Andrea Bolognani wrote: > On Fri, 2017-03-03 at 16:54 +0000, Daniel P. Berrange wrote: > [...] > > @@ -1,3 +1,6 @@ > > [submodule "gnulib"] > > path = .gnulib > > url = git://git.sv.gnu.org/gnulib.git > > +[submodule "src/keycodemapdb"] > > + path = src/keycodemapdb > > + url = https://gitlab.com/keycodemap/keycodemapdb.git > > I think you'll need to update bootstrap_hash() in autogen.sh > to ignore this new submodule, so that it won't run gnulib's > bootstrap every time we update keycodemapdb. > > I'm also wondering whether we can avoid having all developers > run 'git submodule init && git submodule update' after these > changes have been pushed...
I assumed our blackmagic that deals with gnulib changing would also pick up this addition and so make it 'just work', but admittedly i've not tested that. > > +util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ > > + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am > > + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycodetable_,,' \ > > + -e 's,\.h,,'` && \ > > + $(MKDIR_P) util/ && \ > > + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ > > + --lang stdc --varname virKeyCodeTable_$$NAME code-table \ > > + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ > > + $@-tmp && mv $@-tmp $@ || rm $@-tmp > > + > > +util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ > > + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am > > + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeynametable_,,' \ > > + -e 's,\.h,,'` && \ > > + $(MKDIR_P) util/ && \ > > + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ > > + --lang stdc --varname virKeyNameTable_$$NAME name-table \ > > + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ > > + $@-tmp && mv $@-tmp $@ || rm $@-tmp > > Do you really need the dependency on Makefile.am there? Well it ensures we rebuild files if we change these rules for some reason. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
