Re: [libvirt] [PATCH 1/2] Don't include Makefile.ci in Makefile.am
On Tue, May 07, 2019 at 05:45:30PM +0200, Martin Kletzander wrote:
The way it works now the Makefile needs to be both make valid and
automake
valid. That is fine for now, but if we want to use anything more advanced, like
conditionals, we cannot have it like that any more.
So instead forward all ci-* rules to that file.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 0d8bb733e6d2..442bae511828 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST = \
libvirt-qemu.pc.in \
libvirt-lxc.pc.in \
libvirt-admin.pc.in \
+ Makefile.ci \
Makefile.nonreentrant \
autogen.sh \
cfg.mk \
Indentation is not consistent here - tabs vs non-tabs.
@@ -107,4 +108,5 @@ gen-AUTHORS:
rm -f all.list maint.list contrib.list; \
fi
-include Makefile.ci
+ci-%:
+ $(MAKE) -f Makefile.ci $@
Will this cause all variables to be forwarded ?
eg will
make ci-build@fedora-29 CI_IMAGE_TAG=:latest
result in
make -f Makefile.ci ci-build@fedora-29 CI_IMAGE_TAG=:latest
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|