[libvirt] [PATCH 0/2] Two small problems with hyperv Makefile
I found these when make failed after running "make maintainer-clean". Laine Stump (2): hyperv: fix typo in Makefile.am.inc hyperv: erase "generated files" sentinel during make maintainer-clean src/hyperv/Makefile.inc.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.14.4
The problem has been around for quite awhile - the misspelling was faithfully copied from src/Makefile.am to src/hyperv/Makefile.am.inc in commit 253b528c. Signed-off-by: Laine Stump <laine@laine.org> --- src/hyperv/Makefile.inc.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 1478d77b08..3833589470 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -26,10 +26,10 @@ HYPERV_DRIVER_EXTRA_DIST = \ $(HYPERV_GENERATED_STAMP) \ $(NULL) -DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SORUCES) +DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SOURCES) EXTRA_DIST += \ - $(HYPERV_DRIVER_SORUCES) \ + $(HYPERV_DRIVER_SOURCES) \ $(HYPERV_DRIVER_EXTRA_DIST) \ $(NULL) -- 2.14.4
Re-generating of generated source files in the hyperv directory depends on src/.hyperv_wmi_generator.stamp not existing, or having a timestamp older than src/hyperv/hyperv_wmi_generator.py. "make maintainer-clean" erases the generated files, but not this sentinel file, so the erased files aren't regenerated during the next make. Once we add it to the list of MAINTAINERCLEANFILES, it gets deleted at the same time as the generated files, so make is able to understand they need regeneration. Signed-off-by: Laine Stump <laine@laine.org> --- src/hyperv/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 3833589470..a768272b72 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -43,7 +43,7 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py \ && touch $@ -MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) +MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) if WITH_HYPERV noinst_LTLIBRARIES += libvirt_driver_hyperv.la -- 2.14.4
On 06/21/2018 09:54 AM, Laine Stump wrote:
I found these when make failed after running "make maintainer-clean".
Laine Stump (2): hyperv: fix typo in Makefile.am.inc hyperv: erase "generated files" sentinel during make maintainer-clean
src/hyperv/Makefile.inc.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
ACK Michal
participants (2)
-
Laine Stump -
Michal Privoznik