Patchwork [4/7] Makefile: fix out-of-tree builds

login
register
mail settings
Submitter Stefan Hajnoczi
Date July 27, 2011, 9:17 a.m.
Message ID <1311758252-10072-5-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/107000/
State New
Headers show

Comments

Stefan Hajnoczi - July 27, 2011, 9:17 a.m.
From: Alexandre Raymond <cerbere@gmail.com>

This patch fixes a minor bugs which prevented QEMU from being built
out of tree.

Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Alexandre Raymond - July 27, 2011, 2:18 p.m.
Hi Stefan,

You may drop this patch, it doesn't do anything after all...

Sorry about that.

Alexandre

On Wed, Jul 27, 2011 at 5:17 AM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> From: Alexandre Raymond <cerbere@gmail.com>
>
> This patch fixes a minor bugs which prevented QEMU from being built
> out of tree.
>
> Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index eb1c788..cbd614a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -46,7 +46,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
>
>  -include $(SUBDIR_DEVICES_MAK_DEP)
>
> -%/config-devices.mak: default-configs/%.mak
> +%/config-devices.mak: $(SRC_PATH)/default-configs/%.mak
>        $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
>        @if test -f $@; then \
>          if cmp -s $@.old $@; then \
> --
> 1.7.5.4
>
>
Stefan Hajnoczi - July 27, 2011, 2:57 p.m.
On Wed, Jul 27, 2011 at 10:17 AM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> From: Alexandre Raymond <cerbere@gmail.com>
>
> This patch fixes a minor bugs which prevented QEMU from being built
> out of tree.
>
> Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index eb1c788..cbd614a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -46,7 +46,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
>
>  -include $(SUBDIR_DEVICES_MAK_DEP)
>
> -%/config-devices.mak: default-configs/%.mak
> +%/config-devices.mak: $(SRC_PATH)/default-configs/%.mak
>        $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")

Agreed, we don't need to explicitly use $(SRC_PATH) since VPATH is set
to the source directory and $< expands to the full path name.  I have
dropped it from the git branch.

Stefan

Patch

diff --git a/Makefile b/Makefile
index eb1c788..cbd614a 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@  config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
 
 -include $(SUBDIR_DEVICES_MAK_DEP)
 
-%/config-devices.mak: default-configs/%.mak
+%/config-devices.mak: $(SRC_PATH)/default-configs/%.mak
 	$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
 	@if test -f $@; then \
 	  if cmp -s $@.old $@; then \