]> xenbits.xensource.com Git - libvirt.git/commitdiff
Don't include Makefile.ci in Makefile.am
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 7 May 2019 15:21:55 +0000 (17:21 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Fri, 10 May 2019 07:12:52 +0000 (09:12 +0200)
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@redhat.com>
Makefile.am

index 0d8bb733e6d2c6572cce1947c89834c7e4382c8b..dedd8d2ff825b78a545d812afeac8ea8ae59ae41 100644 (file)
@@ -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 \
@@ -107,4 +108,5 @@ gen-AUTHORS:
          rm -f all.list maint.list contrib.list; \
        fi
 
-include Makefile.ci
+ci-%:
+       $(MAKE) -f Makefile.ci $@