diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-03 16:38:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-03 16:38:23 +0200 |
| commit | 06ed419bb38af184702052b280eb1c4197070326 (patch) | |
| tree | c27760148ec152080d85f6c905eeceec456f0825 /mk | |
| parent | dfb387ffa8db1f41c56699385b1325d5660be009 (diff) | |
| parent | 806cefae6dd3c23390e422277ee8068bf29c2fbd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 7 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index e4b5866bc..7f1d49838 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -123,9 +123,9 @@ ifeq ($(ADK_NATIVE),y) $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install else ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/install tools/install package/compile + $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif @@ -157,6 +157,9 @@ toolchain/%: ${STAGING_DIR} tools/%: $(MAKE) -C tools $(patsubst tools/%,%,$@) +jtools/%: + $(MAKE) -C jtools $(patsubst jtools/%,%,$@) + image: $(MAKE) -C target image diff --git a/mk/vars.mk b/mk/vars.mk index f2cea7b59..ee5faec10 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -18,6 +18,7 @@ STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_ STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_* STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* +STAGING_JAVA_HOST_DIR:= ${BASE_DIR}/jhost # use headers and foo-config from system ifneq ($(ADK_NATIVE),) STAGING_TARGET_DIR:= @@ -34,6 +35,7 @@ STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_LIBC} TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build +JTOOLS_BUILD_DIR= $(BASE_DIR)/jtools_build TOOLS_DIR:= $(BASE_DIR)/bin/tools SCRIPT_DIR:= $(BASE_DIR)/scripts BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} @@ -199,7 +201,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=30 $(QUIET) +FETCH_CMD?= wget --timeout=30 -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe |