summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-05 15:32:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-05 15:32:35 +0200
commit1879491b2b6e799b20ac06d1b510726eb200944f (patch)
tree50759d89be66d701f4dc488dba56ca76926232f8 /mk
parent643a35a70d54283ab5c0456ff779ac843fe37741 (diff)
add menu based configuration of a password
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk9
-rw-r--r--mk/vars.mk4
2 files changed, 8 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 2f4b367b9..8791ebf1d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -90,12 +90,12 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
ifeq ($(ADK_NATIVE),y)
- $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+ $(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 package/compile
+ $(MAKE) -f mk/build.mk toolchain/install tools/install package/compile
else
- $(MAKE) -f mk/build.mk toolchain/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 target/config-prepare target/compile package/compile root_clean package/install target/install package_index
endif
endif
@@ -136,6 +136,9 @@ target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
toolchain/%: ${STAGING_DIR}
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+tools/%:
+ $(MAKE) -C tools $(patsubst tools/%,%,$@)
+
image:
$(MAKE) -C target image
diff --git a/mk/vars.mk b/mk/vars.mk
index 42c534071..f26e07b6a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -37,8 +37,8 @@ PACKAGE_DIR:= $(BIN_DIR)/packages
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
-REAL_GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux-$(ADK_TARGET_SUFFIX)
-GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux
+REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev
ifeq ($(ADK_NATIVE),y)
TARGET_CROSS:=