[libvirt] [PATCH 15/25] src: access: generate source files into build directory

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/access/Makefile.inc.am      | 14 +++++++-------
 src/admin/Makefile.inc.am       |  1 +
 src/interface/Makefile.inc.am   |  1 +
 src/libxl/Makefile.inc.am       |  1 +
 src/lxc/Makefile.inc.am         |  1 +
 src/network/Makefile.inc.am     |  1 +
 src/node_device/Makefile.inc.am |  1 +
 src/nwfilter/Makefile.inc.am    |  1 +
 src/qemu/Makefile.inc.am        |  1 +
 src/remote/Makefile.inc.am      |  1 +
 src/secret/Makefile.inc.am      |  1 +
 src/storage/Makefile.inc.am     |  1 +
 12 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am
index ea27adbe0b..2d871ec8aa 100644
--- 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 bea0967aaf..94cbed9972 100644
--- 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 780b2277ba..30ea98ad15 100644
--- 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 ef8e9613f5..5d9cf14f7f 100644
--- 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 78f14bf37a..f22a53e58d 100644
--- 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 b58b5ea645..2f7932ae60 100644
--- 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 9b58636a0c..1dfa0a5274 100644
--- 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 e24e8aa2a0..ca05cba934 100644
--- 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 2074a5f54f..69e290c428 100644
--- 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 6b0ae586d1..7361d02cf4 100644
--- 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 fd7c90a137..94f293d418 100644
--- 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 08a9f4e86c..ec35ab7665 100644
--- 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) \
-- 
2.21.0