[libvirt] [PATCH 21/35] tests: Makefile: Sanitize entry for qemublocktest

Peter Krempa posted 35 patches 7 years ago
[libvirt] [PATCH 21/35] tests: Makefile: Sanitize entry for qemublocktest
Posted by Peter Krempa 7 years ago
Remove gnulib from _LDADD and move LDADDS to replace it. Also reformat
the _SOURCES so that they can be easily extended.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7b93fbde69..67850349de 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -655,12 +655,14 @@ qemuhotplugtest_SOURCES = \
 qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS)

 qemublocktest_SOURCES = \
-	qemublocktest.c testutils.h testutils.c
-qemublocktest_LDADD = $(LDADDS) \
+	qemublocktest.c \
+	testutils.h testutils.c \
+	$(NULL)
+qemublocktest_LDADD = \
 	../src/libvirt_conf.la \
 	../src/libvirt_util.la \
 	$(qemu_LDADDS) \
-	../gnulib/lib/libgnu.la \
+	$(LDADDS) \
 	$(NULL)

 domainsnapshotxml2xmltest_SOURCES = \
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 21/35] tests: Makefile: Sanitize entry for qemublocktest
Posted by John Ferlan 7 years ago

On 04/25/2018 11:15 AM, Peter Krempa wrote:
> Remove gnulib from _LDADD and move LDADDS to replace it. Also reformat
> the _SOURCES so that they can be easily extended.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  tests/Makefile.am | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 

ew, ah, some black magic... Looks like possibly adding $(PROBES_O),
adding libvirt.la, and adding "-Wl,--no-copy-dt-needed-entries" to the
test image creation.  Dragging in a lot, but I see future patches will
need it...

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list