[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] build: don't lose probes.o files



The previous patch fixed an incremental build, but missed that on a
fresh checkout, we now have nothing requiring that stops make from
nuking libvirt_qemu_probes.o.

* src/Makefile.am ($(libvirt_driver_qemu_la_SOURCES)): Delete,
since this variable is empty.
(.PRECIOUS): Add %_probes.o, so they don't get nuked as an
intermediate by-product after creating %_probes.lo.
---

Pushing under the build-breaker rule; this time I've done more testing,
including ./autobuild.sh on a fresh checkout (that died later on,
due to the augeas issue mentioned here[1], but at least it got past the
probes.o hangup).
[1] https://www.redhat.com/archives/libvir-list/2012-May/msg01296.html

 src/Makefile.am |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 533e78a..c8efa5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1294,8 +1294,6 @@ BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp
 if WITH_QEMU
 libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
 nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h
-
-$(libvirt_driver_qemu_la_SOURCES): libvirt_qemu_probes.h
 endif

 tapsetdir = $(datadir)/systemtap/tapset
@@ -1304,6 +1302,7 @@ tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp
 %_probes.h: %_probes.d
 	$(AM_V_GEN)$(DTRACE) -o $@ -h -s $<

+.PRECIOUS: %_probes.o
 %_probes.o: %_probes.d
 	$(AM_V_GEN)$(DTRACE) -o $@ -G -s $<

-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]