Attachment #248143 for bug #276787

View | Details | Raw Unified | Return to bug 276787
Collapse All | Expand All

Lines 20-25 potfiles_dep = [ Link Here

(-)b/po/meson.build (+1 lines)
20	access_gen_sources,	20	access_gen_sources,
21	admin_client_generated,	21	admin_client_generated,
22	admin_driver_generated,	22	admin_driver_generated,
		23	remote_protocol_generated,
23	remote_driver_generated,	24	remote_driver_generated,
24	remote_daemon_generated,	25	remote_daemon_generated,
25	]	26	]

Lines 616-622 foreach daemon : virt_daemons Link Here

(-)b/src/meson.build (-1 / +5 lines)
616	bin = executable(	616	bin = executable(
617	daemon['name'],	617	daemon['name'],
618	[	618	[
619	daemon.get('sources', [ remote_daemon_sources, remote_daemon_generated ]),	619	daemon.get('sources', [
		620	remote_protocol_generated,
		621	remote_daemon_sources,
		622	remote_daemon_generated
		623	]),
620	dtrace_gen_objects,	624	dtrace_gen_objects,
621	],	625	],
622	c_args: [	626	c_args: [





foreach name : [ 'remote', 'qemu', 'lxc' ]
  client_bodies_h = '@0@_client_bodies.h'.format(name)
  protocol_c = '@0@_protocol.c'.format(name)
  protocol_h = '@0@_protocol.h'.format(name)
  protocol_x = '@0@_protocol.x'.format(name)

  remote_driver_generated += custom_target(

    ],
    capture: true,
  )
endforeach

remote_protocol_generated = []

foreach name : [ 'remote', 'qemu', 'lxc' ]
  protocol_c = '@0@_protocol.c'.format(name)
  protocol_h = '@0@_protocol.h'.format(name)
  protocol_x = '@0@_protocol.x'.format(name)

  remote_protocol_generated += custom_target(
    protocol_h,
    input: protocol_x,
    output: protocol_h,

    ],
  )

  remote_protocol_generated += custom_target(
    protocol_c,
    input: protocol_x,
    output: protocol_c,

  remote_driver_lib = static_library(
    'virt_remote_driver',
    [
      remote_protocol_generated,
      remote_driver_sources,
      remote_driver_generated,
    ],

Return to bug 276787

Lines 7-14 remote_driver_generated = [] Link Here

(-)b/src/remote/meson.build (-4 / +11 lines)
7		7
8	foreach name : [ 'remote', 'qemu', 'lxc' ]	8	foreach name : [ 'remote', 'qemu', 'lxc' ]
9	client_bodies_h = '@0@_client_bodies.h'.format(name)	9	client_bodies_h = '@0@_client_bodies.h'.format(name)
10	protocol_c = '@0@_protocol.c'.format(name)
11	protocol_h = '@0@_protocol.h'.format(name)
12	protocol_x = '@0@_protocol.x'.format(name)	10	protocol_x = '@0@_protocol.x'.format(name)
13		11
14	remote_driver_generated += custom_target(	12	remote_driver_generated += custom_target(
Lines 20-27 foreach name : [ 'remote', 'qemu', 'lxc' ] Link Here
20	],	18	],
21	capture: true,	19	capture: true,
22	)	20	)
		21	endforeach
23		22
24	remote_driver_generated += custom_target(	23	remote_protocol_generated = []
		24
		25	foreach name : [ 'remote', 'qemu', 'lxc' ]
		26	protocol_c = '@0@_protocol.c'.format(name)
		27	protocol_h = '@0@_protocol.h'.format(name)
		28	protocol_x = '@0@_protocol.x'.format(name)
		29
		30	remote_protocol_generated += custom_target(
25	protocol_h,	31	protocol_h,
26	input: protocol_x,	32	input: protocol_x,
27	output: protocol_h,	33	output: protocol_h,
Lines 32-38 foreach name : [ 'remote', 'qemu', 'lxc' ] Link Here
32	],	38	],
33	)	39	)
34		40
35	remote_driver_generated += custom_target(	41	remote_protocol_generated += custom_target(
36	protocol_c,	42	protocol_c,
37	input: protocol_x,	43	input: protocol_x,
38	output: protocol_c,	44	output: protocol_c,
Lines 143-148 if conf.has('WITH_REMOTE') Link Here
143	remote_driver_lib = static_library(	149	remote_driver_lib = static_library(
144	'virt_remote_driver',	150	'virt_remote_driver',
145	[	151	[
		152	remote_protocol_generated,
146	remote_driver_sources,	153	remote_driver_sources,
147	remote_driver_generated,	154	remote_driver_generated,
148	],	155	],