From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55424)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <vilanova@ac.upc.edu>) id 1aRMJA-0000b7-Dz
	for qemu-devel@nongnu.org; Thu, 04 Feb 2016 10:59:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <vilanova@ac.upc.edu>) id 1aRMJ7-0008Ne-OI
	for qemu-devel@nongnu.org; Thu, 04 Feb 2016 10:59:00 -0500
Received: from roura.ac.upc.edu ([147.83.33.10]:59680 helo=roura.ac.upc.es)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <vilanova@ac.upc.edu>) id 1aRMJ7-0008NN-BH
	for qemu-devel@nongnu.org; Thu, 04 Feb 2016 10:58:57 -0500
From: =?utf-8?Q?Llu=C3=ADs_Vilanova?= <vilanova@ac.upc.edu>
References: <145459675563.11777.5257429454748921678.stgit@localhost>
	<CAFEAcA99Cc_9Hnn5W7kw3g4jCxuQmpSQA-Jpiyo2DggUHnKUmw@mail.gmail.com>
Date: Thu, 04 Feb 2016 16:58:54 +0100
In-Reply-To: <CAFEAcA99Cc_9Hnn5W7kw3g4jCxuQmpSQA-Jpiyo2DggUHnKUmw@mail.gmail.com>
	(Peter Maydell's message of "Thu, 4 Feb 2016 14:55:51 +0000")
Message-ID: <874mdo79hd.fsf@fimbulvetr.bsc.es>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH ] [trivial] qapi: Build-depend on all json
	files
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>

Peter Maydell writes:

> On 4 February 2016 at 14:39, Llu=C3=ADs Vilanova <vilanova@ac.upc.edu> wr=
ote:
>> Dynamically detects the files used to generate QAPI code, thus ensuring
>> it's never out of sync with the sources.
>>=20
>> Signed-off-by: Llu=C3=ADs Vilanova <vilanova@ac.upc.edu>
>> ---
>> Makefile |    6 ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>>=20
>> diff --git a/Makefile b/Makefile
>> index d0de2d4..627f772 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -269,10 +269,8 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/script=
s/qapi-commands.py $(qapi-py)
>> $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
>> "  GEN   $@")
>>=20
>> -qapi-modules =3D $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.j=
son \
>> -               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.=
json \
>> -               $(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.=
json \
>> -               $(SRC_PATH)/qapi/crypto.json
>> +qapi-modules =3D $(SRC_PATH)/qapi-schema.json
>> +qapi-modules +=3D $(shell find $(SRC_PATH)/qapi -name "*.json")

> All the .json files are in the same directory, so I don't think we should
> need to use find here. Does

> qapi-modules +=3D $(wildcard $(SRC_PATH)/qapi/*.json))

> work ?

It certainly would work, I'll send a v2 with wildcard.

PS: this patch was triggered by finding out that qapi/trace.json is not on =
the
    qapi-modules list

Cheers,
  Lluis