From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:54751)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1TYKkM-00056P-U1
	for qemu-devel@nongnu.org; Tue, 13 Nov 2012 12:58:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1TYKkJ-0005nZ-Rf
	for qemu-devel@nongnu.org; Tue, 13 Nov 2012 12:58:02 -0500
Received: from v220110690675601.yourvserver.net ([78.47.199.172]:40508)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1TYKkJ-0005nL-Ks
	for qemu-devel@nongnu.org; Tue, 13 Nov 2012 12:57:59 -0500
Message-ID: <50A28A25.6050500@weilnetz.de>
Date: Tue, 13 Nov 2012 18:57:57 +0100
From: Stefan Weil <sw@weilnetz.de>
MIME-Version: 1.0
References: <1352796133-956-1-git-send-email-kraxel@redhat.com>
	<1352796133-956-2-git-send-email-kraxel@redhat.com>
In-Reply-To: <1352796133-956-2-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/6] pixman: add output dir to include path
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: Gerd Hoffmann <kraxel@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org

Am 13.11.2012 09:42, schrieb Gerd Hoffmann:
> Needed to make sure the (generated) pixman-version.h file is found.
> Based on a patch from Blue Swirl.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   configure |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 7290f50..18faded 100755
> --- a/configure
> +++ b/configure
> @@ -2121,8 +2121,9 @@ else
>       echo "      git submodule update --init pixman"
>       exit 1
>     fi
> -  pixman_cflags="-I${source_path}/pixman/pixman"
> -  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
> +  mkdir -p pixman/pixman
> +  pixman_cflags="-I${source_path}/pixman/pixman -I$(pwd)/pixman/pixman"
> +  pixman_libs="-L$(pwd)/pixman/pixman/.libs -lpixman-1"

I'd prefer \$(BUILD_DIR) instead of $(pwd) for cflags and libs
because it allows moving the build directory.

\$(SRC_PATH) could be used instead of $(source_path).
This would also avoid hardcoded paths in the generated
Makefile code and match better to other include parameters.

>   fi
>   QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
>   libs_softmmu="$libs_softmmu $pixman_libs"
> @@ -4154,7 +4155,6 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
>   DIRS="$DIRS roms/seabios roms/vgabios"
>   DIRS="$DIRS qapi-generated"
>   DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
> -DIRS="$DIRS pixman"
>   FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
>   FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
>   FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"