src: access: generate source files into build directory

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/.gitignore b/.gitignore
index 6f8d59987e17018926681bfc310907a3b37db520..8c1078c56cb461b76cc28f724f9c81f2e29fb7a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,13 +41,6 @@ Makefile.in
 # libvirt related ignores
 /build/
 /ci/scratch/
-/src/access/org.libvirt.api.policy
-/src/access/viraccessapicheck.c
-/src/access/viraccessapicheck.h
-/src/access/viraccessapichecklxc.c
-/src/access/viraccessapichecklxc.h
-/src/access/viraccessapicheckqemu.c
-/src/access/viraccessapicheckqemu.h
 /src/admin/admin_client.h
 /src/admin/admin_server_dispatch_stubs.h
 /src/esx/*.generated.*

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a422d3659e678cfe17650271c19ab895d6cd0faa..6f4bfeeb3d2c4c1b3dba9900d91673eeaf72c8d0 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,6 @@
+@BUILDDIR@/src/access/viraccessapicheck.c
+@BUILDDIR@/src/access/viraccessapichecklxc.c
+@BUILDDIR@/src/access/viraccessapicheckqemu.c
 @SRCDIR@/gnulib/lib/gai_strerror.c
 @SRCDIR@/gnulib/lib/regcomp.c
 @SRCDIR@/src/access/viraccessdriverpolkit.c

diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am
index ea27adbe0bef5a2bc20badbf3db04fe61ec11792..2d871ec8aa6ded27e18de111f1919564548a8da1 100644 (file)
--- a/src/access/Makefile.inc.am
+++ b/src/access/Makefile.inc.am
@@ -38,7 +38,7 @@ ACCESS_DRIVER_POLKIT_SOURCES = \
        access/viraccessdriverpolkit.c \
        $(NULL)
 
-ACCESS_DRIVER_POLKIT_POLICY = $(srcdir)/access/org.libvirt.api.policy
+ACCESS_DRIVER_POLKIT_POLICY = access/org.libvirt.api.policy
 
 GENERATED_SYM_FILES += $(ACCESS_DRIVER_SYM_FILES)
 
@@ -122,31 +122,31 @@ access/viraccessapicheck.h: $(srcdir)/rpc/gendispatch.pl \
                        $(REMOTE_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclheader \
          remote REMOTE $(REMOTE_PROTOCOL) \
-         > $(srcdir)/access/viraccessapicheck.h
+         > access/viraccessapicheck.h
 access/viraccessapicheck.c: $(srcdir)/rpc/gendispatch.pl \
                        $(REMOTE_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclbody \
          remote REMOTE $(REMOTE_PROTOCOL) access/viraccessapicheck.h \
-         > $(srcdir)/access/viraccessapicheck.c
+         > access/viraccessapicheck.c
 
 access/viraccessapicheckqemu.h: $(srcdir)/rpc/gendispatch.pl \
                        $(QEMU_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclheader \
          qemu QEMU $(QEMU_PROTOCOL) \
-         > $(srcdir)/access/viraccessapicheckqemu.h
+         > access/viraccessapicheckqemu.h
 access/viraccessapicheckqemu.c: $(srcdir)/rpc/gendispatch.pl \
                        $(QEMU_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclbody \
          qemu QEMU $(QEMU_PROTOCOL) access/viraccessapicheckqemu.h \
-         > $(srcdir)/access/viraccessapicheckqemu.c
+         > access/viraccessapicheckqemu.c
 
 access/viraccessapichecklxc.h: $(srcdir)/rpc/gendispatch.pl \
                        $(LXC_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclheader \
          lxc LXC $(LXC_PROTOCOL) \
-         > $(srcdir)/access/viraccessapichecklxc.h
+         > access/viraccessapichecklxc.h
 access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \
                        $(LXC_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclbody \
          lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \
-         > $(srcdir)/access/viraccessapichecklxc.c
+         > access/viraccessapichecklxc.c

diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
index bea0967aafd8dc06c27e161b110abb1724b98e3a..94cbed99729691adbb4c34152d67bb17c26f026c 100644 (file)
--- a/src/admin/Makefile.inc.am
+++ b/src/admin/Makefile.inc.am
@@ -89,6 +89,7 @@ endif WITH_DTRACE_PROBES
 libvirt_admin_la_CFLAGS = \
        $(AM_CFLAGS) \
        -I$(builddir)/admin \
+       -I$(builddir)/access \
        -I$(srcdir)/remote \
        -I$(srcdir)/rpc \
        -I$(builddir)/rpc \

diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 780b2277bacc9af1dd9fdc48aca8245c962faead..30ea98ad15347aea5458fe7eeea4a61aca639abf 100644 (file)
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -21,6 +21,7 @@ if WITH_INTERFACE
 mod_LTLIBRARIES += libvirt_driver_interface.la
 libvirt_driver_interface_la_CFLAGS = \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
        $(LIBNL_CFLAGS) \

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index ef8e9613f57031a59dc65103baa618d06fd059b5..5d9cf14f7fe2268c35a0bb1d460500059dd4e9a7 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -44,6 +44,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \
        $(LIBXL_CFLAGS) \
        $(LIBXML_CFLAGS) \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        -I$(srcdir)/secret \
        $(AM_CFLAGS) \

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 78f14bf37ae4da87af97a3e05d3907b86ba6aed7..f22a53e58d5b0a0ea3a5cded4edbba6838091286 100644 (file)
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -94,6 +94,7 @@ libvirt_driver_lxc_impl_la_CFLAGS = \
        $(FUSE_CFLAGS) \
        $(XDR_CFLAGS) \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        -I$(builddir)/lxc \
        -I$(builddir)/rpc \

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index b58b5ea645dba9f6a276d50ea155cfea69858f92..2f7932ae602690435b525aaa63a88b660da7087d 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -44,6 +44,7 @@ libvirt_driver_network_impl_la_CFLAGS = \
        $(LIBNL_CFLAGS) \
        $(DBUS_CFLAGS) \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
        $(NULL)

diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 9b58636a0c52f01b3758fd7da26ca13344b1c90e..1dfa0a527434cb7d1b8e1028979de9856246a1a8 100644 (file)
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -39,6 +39,7 @@ libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
 
 libvirt_driver_nodedev_la_CFLAGS = \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
        $(LIBNL_CFLAGS) \

diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index e24e8aa2a03e418441f08bd1bbaf8b458c1f7e29..ca05cba93491ac9fe09d5058c4e1a0398fff10f2 100644 (file)
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -37,6 +37,7 @@ libvirt_driver_nwfilter_impl_la_CFLAGS = \
        $(LIBNL_CFLAGS) \
        $(DBUS_CFLAGS) \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
        $(NULL)

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 2074a5f54f4b4ec60f80e64db29af4736eb9b12f..69e290c4286c1ff2ad955d9edc73879e43b08f5a 100644 (file)
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -95,6 +95,7 @@ libvirt_driver_qemu_impl_la_CFLAGS = \
        $(SELINUX_CFLAGS) \
        $(XDR_CFLAGS) \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        -I$(srcdir)/secret \
        $(AM_CFLAGS) \

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 6b0ae586d1182314ad611c62ef491dd17441ab6c..7361d02cf4affea9cf592d072527793c92c821e7 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -48,6 +48,7 @@ REMOTE_DAEMON_CFLAGS = \
        $(PIE_CFLAGS) \
        $(COVERAGE_CFLAGS) \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        -I$(srcdir)/rpc \
        -I$(builddir)/rpc \

diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index fd7c90a1376da610a1a0985639d3a06f5852728a..94f293d418102c3be9b572bfebdab38dfd25bf79 100644 (file)
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -28,6 +28,7 @@ if WITH_SECRETS
 mod_LTLIBRARIES += libvirt_driver_secret.la
 libvirt_driver_secret_la_CFLAGS = \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
        $(NULL)

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 08a9f4e86c777aca6f383929d7cbb9c9ef297c51..ec35ab7665e1f181b1414af00105c055186201c0 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -119,6 +119,7 @@ storagefile_LTLIBRARIES =
 libvirt_driver_storage_impl_la_SOURCES =
 libvirt_driver_storage_impl_la_CFLAGS = \
        -I$(srcdir)/access \
+       -I$(builddir)/access \
        -I$(srcdir)/conf \
        -I$(srcdir)/secret \
        $(AM_CFLAGS) \