diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 17:48:02 -0300 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 17:48:02 -0300 |
commit | 3ed397b79d2640d4e59608ed4659a2d6f344cddf (patch) | |
tree | 331402d5c419339b69657fea7fad68a48d7d52c6 /Makefile.target | |
parent | Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-merge (diff) | |
parent | Rename config.{h, mak} config-target.{h, mak} (diff) | |
download | qemu-kvm-3ed397b79d2640d4e59608ed4659a2d6f344cddf.tar.gz qemu-kvm-3ed397b79d2640d4e59608ed4659a2d6f344cddf.tar.bz2 qemu-kvm-3ed397b79d2640d4e59608ed4659a2d6f344cddf.zip |
Merge commit '25be210f69543faae4f22bfa2c7446c4f1be62ef' into upstream-merge
* commit '25be210f69543faae4f22bfa2c7446c4f1be62ef':
Rename config.{h, mak} config-target.{h, mak}
Remove useless check for config-host.mak
Conflicts:
configure
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index ff614d815..bdc6e20f8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -1,7 +1,7 @@ # -*- Mode: makefile -*- include ../config-host.mak -include config.mak +include config-target.mak include $(SRC_PATH)/rules.mak TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) |