aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-07 18:10:54 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-02-24 01:15:23 +0100
commitaff94b88c4ec057f20950d5e7a88b90cc4d97dce (patch)
tree589c82139a6575bec8202eb4bb4c792729a870de /Makefile
parent02f10347d2244c192de8da96a6d6a6a66c394721 (diff)
downloadexternal_qemu-aff94b88c4ec057f20950d5e7a88b90cc4d97dce.zip
external_qemu-aff94b88c4ec057f20950d5e7a88b90cc4d97dce.tar.gz
external_qemu-aff94b88c4ec057f20950d5e7a88b90cc4d97dce.tar.bz2
Build arm and x86 binaries at the same time.
This patch modifies the way we build the emulator's various programs. It reduces the number of static libraries generated, and better segregates between common, ui, qemu and target-specific code. Note that we build both the arm and x86 binaries at the same time in all build scenarios for now. This is done to catch build regressions as soon as possible. Change-Id: I6240705041e137e32f207e1e2444c614c52aaf05
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9bb69f3..053525c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,16 @@
# limitations under the License.
#
+# disable implicit rules
+.SUFFIXES:
+%:: %,v
+%:: RCS/%
+%:: RCS/%,v
+%:: s.%
+%:: SCCS/s.%
+%.c: %.w %.ch
+
+
# this is a set of definitions that allow the usage of Makefile.android
# even if we're not using the Android build system.
#
@@ -24,7 +34,7 @@ CONFIG_MAKE := $(OBJS_DIR)/config.make
CONFIG_H := $(OBJS_DIR)/config-host.h
ifeq ($(wildcard $(CONFIG_MAKE)),)
- $(error "The configuration file '$(CONFIG_MAKE)' doesnt' exist, please run the "rebuilt.sh" script)
+ $(error "The configuration file '$(CONFIG_MAKE)' doesnt' exist, please run the "android-configure.sh" script)
endif
include $(CONFIG_MAKE)