summaryrefslogtreecommitdiff
path: root/mk/build.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-01 09:40:19 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-01 09:40:19 +0100
commit0a9ca018d598a1d263ebc9d45f41af0bdd498274 (patch)
tree4409eaed2cfea2ee25a6474f4bce0be63ca62814 /mk/build.mk
parent48125484eaaf38ed6b373924fee593b3e0d5c920 (diff)
parent3542293b7fcf88cc6aff3696026a7568c43cdd3f (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/build.mk')
-rw-r--r--mk/build.mk44
1 files changed, 22 insertions, 22 deletions
diff --git a/mk/build.mk b/mk/build.mk
index eadccdcb3..90fce65a8 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -91,7 +91,7 @@ POSTCONFIG= -@\
if [ -f .adkinit ];then rm .adkinit;\
else \
if [ -f .config.old ];then \
- $(TOPDIR)/bin/pkgrebuild;\
+ $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgrebuild;\
rebuild=0; \
if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
touch .rebuild.busybox;\
@@ -138,7 +138,7 @@ include $(TOPDIR)/rules.mk
all: world
${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
- $(BIN_DIR)/depmaker > ${TOPDIR}/package/Depends.mk
+ $(STAGING_HOST_DIR)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk
.NOTPARALLEL:
.PHONY: all world clean cleantarget cleandir distclean image_clean
@@ -155,12 +155,12 @@ ifeq ($(ADK_NATIVE),y)
else
ifeq ($(ADK_TOOLCHAIN),y)
ifeq ($(ADK_TOOLCHAIN_ONLY),y)
- $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile
+ $(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile
else
- $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install
+ $(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile root_clean package/install
endif
else
- $(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+ $(MAKE) -f mk/build.mk tools/install toolchain/fixup target/config-prepare target/compile package/compile root_clean package/install target/install package_index
endif
endif
@@ -250,13 +250,13 @@ root_clean:
clean:
@$(TRACE) clean
$(MAKE) -C $(CONFIG) clean
- for d in ${STAGING_PKG_DIR}; do \
- for f in $$(ls $$d/[a-z]* 2>/dev/null |grep -v [A-Z] 2>/dev/null); do \
- while read file ; do \
- rm ${STAGING_DIR}/$$file 2>/dev/null;\
- done < $$f ; \
- rm $$f ; \
- done \
+ for f in $$(ls ${STAGING_PKG_DIR}/ 2>/dev/null |grep -v [A-Z]|grep -v stamps 2>/dev/null); do \
+ while read file ; do \
+ echo ${STAGING_DIR}/$$file ;\
+ rm ${STAGING_DIR}/$$file 2>/dev/null;\
+ done < $$f ; \
+ echo ${STAGING_PKG_DIR}/$$f ;\
+ rm ${STAGING_PKG_DIR}/$$f ; \
done
rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \
${TOPDIR}/package/pkglist.d
@@ -535,7 +535,7 @@ bulktoolchain:
$(GMAKE) prereq && \
$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
- tar -cJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
+ tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
rm .config; \
) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
if [ -f .exit ];then break;fi \
@@ -619,24 +619,24 @@ bulkallmod:
if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \
done
-${TOPDIR}/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
- @mkdir -p ${TOPDIR}/bin
+$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
+ @mkdir -p host_$(GNU_HOST_NAME)/usr/bin
@$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
-${TOPDIR}/bin/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
+$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/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/pkgmaker ${TOPDIR}/bin/pkgrebuild
+package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgmaker $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgrebuild
@echo "Generating menu structure ..."
- @$(TOPDIR)/bin/pkgmaker
+ @$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgmaker
@:>.menu
-${TOPDIR}/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
- $(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/depmaker $(TOPDIR)/tools/adk/depmaker.c
+$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
+ $(CC_FOR_BUILD) -g -o $@ $(TOPDIR)/tools/adk/depmaker.c
-dep: $(TOPDIR)/bin/depmaker
+dep: $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker
@echo "Generating dependencies ..."
- @$(TOPDIR)/bin/depmaker > ${TOPDIR}/package/Depends.mk
+ @$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk
.PHONY: menu dep