From f9e8a355d7ff88bae17ea9f2198fbf3f990cd1bc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 18 Feb 2014 11:28:02 +0100 Subject: use bin directory for host binaries only, use new firmware directory for the resulting firmware --- tools/adk/Makefile | 8 ++++---- tools/bc/Makefile | 6 +++--- tools/cdrtools/Makefile | 6 +++--- tools/cpio/Makefile | 4 ++-- tools/genext2fs/Makefile | 6 +++--- tools/gperf/Makefile | 6 +++--- tools/mkcrypt/Makefile | 4 ++-- tools/mkimage/Makefile | 4 ++-- tools/syslinux/Makefile | 6 +++--- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tools') diff --git a/tools/adk/Makefile b/tools/adk/Makefile index e3c9aceed..60a50ffba 100644 --- a/tools/adk/Makefile +++ b/tools/adk/Makefile @@ -3,15 +3,15 @@ include $(TOPDIR)/rules.mk -install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz +install: ${BIN_DIR}/depmaker ${BIN_DIR}/pkgrebuild ${BIN_DIR}/dkgetsz -${TOOLS_DIR}/depmaker: depmaker.c +${BIN_DIR}/depmaker: depmaker.c ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ depmaker.c -${TOOLS_DIR}/pkgrebuild: pkgrebuild.c strmap.c +${BIN_DIR}/pkgrebuild: pkgrebuild.c strmap.c ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ pkgrebuild.c strmap.c -${TOOLS_DIR}/dkgetsz: dkgetsz.c +${BIN_DIR}/dkgetsz: dkgetsz.c ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c include $(TOPDIR)/mk/tools.mk diff --git a/tools/bc/Makefile b/tools/bc/Makefile index 4f48f9fa9..8d1561049 100644 --- a/tools/bc/Makefile +++ b/tools/bc/Makefile @@ -11,15 +11,15 @@ PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ include ../rules.mk -install: ${TOOLS_DIR}/bc +install: ${BIN_DIR}/bc $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared (cd ${WRKBUILD}; ./configure) ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' touch $@ -${TOOLS_DIR}/bc: $(WRKBUILD)/.compiled +${BIN_DIR}/bc: $(WRKBUILD)/.compiled $(INSTALL_BIN) $(WRKBUILD)/bc/bc \ - ${TOOLS_DIR} + ${BIN_DIR} include $(TOPDIR)/mk/tools.mk diff --git a/tools/cdrtools/Makefile b/tools/cdrtools/Makefile index 965e3553d..6ea90b821 100644 --- a/tools/cdrtools/Makefile +++ b/tools/cdrtools/Makefile @@ -11,15 +11,15 @@ PKG_SITES:= ftp://ftp.berlios.de/pub/cdrecord/ include ../rules.mk -install: ${TOOLS_DIR}/mkisofs +install: ${BIN_DIR}/mkisofs $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared #(cd ${WRKBUILD}; ./configure) ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' touch $@ -${TOOLS_DIR}/mkisofs: $(WRKBUILD)/.compiled +${BIN_DIR}/mkisofs: $(WRKBUILD)/.compiled $(INSTALL_BIN) $(WRKBUILD)/mkisofs/OBJ/*/mkisofs \ - ${TOOLS_DIR} + ${BIN_DIR} include $(TOPDIR)/mk/tools.mk diff --git a/tools/cpio/Makefile b/tools/cpio/Makefile index ceebf8bbb..290eabc8b 100644 --- a/tools/cpio/Makefile +++ b/tools/cpio/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk -install: ${TOOLS_DIR}/cpio +install: ${BIN_DIR}/cpio SRCS:= src/ib_open.c \ src/ib_close.c \ @@ -26,7 +26,7 @@ SRCS:= src/ib_open.c \ src/nonpax.c \ src/cpio.c -${TOOLS_DIR}/cpio: ${SRCS} +${BIN_DIR}/cpio: ${SRCS} ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -D_GNU_SOURCE -Isrc -o $@ $^ include $(TOPDIR)/mk/tools.mk diff --git a/tools/genext2fs/Makefile b/tools/genext2fs/Makefile index 6cb0ce436..b19662941 100644 --- a/tools/genext2fs/Makefile +++ b/tools/genext2fs/Makefile @@ -11,15 +11,15 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=genext2fs/} include ../rules.mk -install: ${TOOLS_DIR}/genext2fs +install: ${BIN_DIR}/genext2fs $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared (cd ${WRKBUILD}; ./configure) ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' touch $@ -${TOOLS_DIR}/genext2fs: $(WRKBUILD)/.compiled +${BIN_DIR}/genext2fs: $(WRKBUILD)/.compiled $(INSTALL_BIN) $(WRKBUILD)/genext2fs \ - ${TOOLS_DIR} + ${BIN_DIR} include $(TOPDIR)/mk/tools.mk diff --git a/tools/gperf/Makefile b/tools/gperf/Makefile index 2d811932b..7b0d0af77 100644 --- a/tools/gperf/Makefile +++ b/tools/gperf/Makefile @@ -11,15 +11,15 @@ PKG_SITES:= http://ftp.gnu.org/pub/gnu/gperf/ include ../rules.mk -install: ${TOOLS_DIR}/gperf +install: ${BIN_DIR}/gperf $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared (cd ${WRKBUILD}; ./configure) ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' touch $@ -${TOOLS_DIR}/gperf: $(WRKBUILD)/.compiled +${BIN_DIR}/gperf: $(WRKBUILD)/.compiled $(INSTALL_BIN) $(WRKBUILD)/src/gperf \ - ${TOOLS_DIR} + ${BIN_DIR} include $(TOPDIR)/mk/tools.mk diff --git a/tools/mkcrypt/Makefile b/tools/mkcrypt/Makefile index 983d9d423..c36ec2a5a 100644 --- a/tools/mkcrypt/Makefile +++ b/tools/mkcrypt/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk -install: ${TOOLS_DIR}/mkcrypt +install: ${BIN_DIR}/mkcrypt -${TOOLS_DIR}/mkcrypt: +${BIN_DIR}/mkcrypt: $(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkcrypt.c include $(TOPDIR)/mk/tools.mk diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile index 426b18b88..66d058370 100644 --- a/tools/mkimage/Makefile +++ b/tools/mkimage/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk -install: ${TOOLS_DIR}/mkimage +install: ${BIN_DIR}/mkimage -${TOOLS_DIR}/mkimage: mkimage.c crc32.c +${BIN_DIR}/mkimage: mkimage.c crc32.c $(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkimage.c crc32.c include $(TOPDIR)/mk/tools.mk diff --git a/tools/syslinux/Makefile b/tools/syslinux/Makefile index 1ac6ef672..5543813d5 100644 --- a/tools/syslinux/Makefile +++ b/tools/syslinux/Makefile @@ -12,7 +12,7 @@ PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/ include ../rules.mk WRKINST:= ${WRKBUILD}/openadk_installroot -install: ${TOOLS_DIR}/extlinux ${STAGING_HOST_DIR}/usr/share/syslinux/.installed +install: ${BIN_DIR}/extlinux ${STAGING_HOST_DIR}/usr/share/syslinux/.installed $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared #(cd ${WRKBUILD}; ./configure) @@ -26,9 +26,9 @@ $(WRKBUILD)/.installed: ${WRKBUILD}/.compiled bios install touch $@ -${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed +${BIN_DIR}/extlinux: $(WRKBUILD)/.installed $(INSTALL_BIN) ${WRKINST}/sbin/extlinux \ - ${TOOLS_DIR} + ${BIN_DIR} ${STAGING_HOST_DIR}/usr/share/syslinux/.installed: ${WRKBUILD}/.installed mkdir -p ${STAGING_HOST_DIR}/usr/share -- cgit v1.2.3