summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-19 16:14:16 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-19 16:14:16 +0100
commit63595c8c3f19a85d105a41da337aa2ca968f4098 (patch)
tree7c7fe83a5e2b397161609b6c73b0c4e7dabd7833 /mk
parentb12d05eaac6fece851a48de9494b2855f17618db (diff)
parent1abce8781525931b856754751e2595e68be74e0f (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk35
1 files changed, 8 insertions, 27 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 9344e7867..f4ae561e3 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -342,16 +342,6 @@ endif
ifneq (,$(filter CYGWIN%,${OStype}))
@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
endif
-ifeq ($(ADKtype),shuttle-sa76)
- @echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
- @echo ADK_TARGET_SYSTEM_SHUTTLE_SA76=y >> $(TOPDIR)/.defconfig
- @sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
- target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
- @echo "choice" > $(TOPDIR)/target/config/Config.in.native
- @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
- @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
- @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
ifeq ($(ADKtype),ibm-x40)
@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
@@ -436,15 +426,6 @@ endif
ifneq (,$(filter CYGWIN%,${OStype}))
@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
endif
-ifeq ($(ADKtype),shuttle-sa76)
- @echo ADK_TARGET_SYSTEM_SHUTTLE_SA76=y >> $(TOPDIR)/all.config
- @sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
- target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
- @echo "choice" > $(TOPDIR)/target/config/Config.in.native
- @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
- @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
- @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
ifeq ($(ADKtype),ibm-x40)
@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config
@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
@@ -636,24 +617,24 @@ bulkallmod:
if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \
done
-${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
- @mkdir -p $(TOPDIR)/bin/tools
+${TOPDIR}/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
+ mkdir -p ${TOPDIR}/bin
@$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
-${TOPDIR}/bin/tools/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
+${TOPDIR}/bin/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
@$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c
-package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild
+package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/pkgmaker ${TOPDIR}/bin/pkgrebuild
@echo "Generating menu structure ..."
- @$(TOPDIR)/bin/tools/pkgmaker
+ @$(TOPDIR)/bin/pkgmaker
@:>.menu
-${BIN_DIR}/depmaker: $(TOPDIR)/tools/adk/depmaker.c
- $(CC_FOR_BUILD) -g -o $(BIN_DIR)/depmaker $(TOPDIR)/tools/adk/depmaker.c
+${TOPDIR}/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
+ $(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/depmaker $(TOPDIR)/tools/adk/depmaker.c
dep: $(BIN_DIR)/depmaker
@echo "Generating dependencies ..."
- @$(BIN_DIR)/depmaker > ${TOPDIR}/package/Depends.mk
+ @$(TOPDIR)/bin/depmaker > ${TOPDIR}/package/Depends.mk
.PHONY: menu dep