[libvirt] [PATCH RESEND] Distribute only generated virkeymaps.h

Martin Kletzander mkletzan at redhat.com
Thu Oct 1 12:39:03 UTC 2015


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.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
No change since the first version, just rebased.  There was a
discussion about another way of doing it, but I figured that that's
not the way to go and the discussion stopped there:

  https://www.redhat.com/archives/libvir-list/2015-September/msg00271.html

 src/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 07d587904f54..8ac20f491e35 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
-
 BUILT_SOURCES += util/virkeymaps.h
+MAINTAINERCLEANFILES += util/virkeymaps.h

 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
--
2.6.0




More information about the libvir-list mailing list