summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-28 10:38:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-28 10:38:59 +0200
commite9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 (patch)
tree25656fc11aa2d35418a76114f8d82262e9536bad /package/busybox
parent1143ead360fb043f43388d727e710f358702bc9a (diff)
fix busybox rebuild issue, simplify target Makefiles
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 4881762a1..0e3050b56 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -30,6 +30,12 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
+bbrebuild:
+ @if [ -f ${TOPDIR}/.bbrebuild ];then \
+ rm ${WRKBUILD}/.build_done; \
+ rm ${TOPDIR}/.bbrebuild; \
+ fi
+
${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
${TOPDIR}/.busyboxcfg
@@ -38,7 +44,7 @@ ${WRKBUILD}/.config: ${TOPDIR}/.busyboxcfg
cp $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
-do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
+do-configure: ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
yes '' | \
$(MAKE) V=1 \
@@ -51,7 +57,7 @@ else
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
endif
-do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
+do-build: do-configure
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
@@ -60,7 +66,7 @@ else
IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
endif
-do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+do-install: ${WRKBUILD}/.config ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
@@ -78,6 +84,6 @@ udhcpd-install:
${INSTALL_DIR} ${IDIR_UDHCPD}/etc/
${INSTALL_DATA} ./files/udhcpd.conf ${IDIR_UDHCPD}/etc/
-fake: $(TOPDIR)/.busyboxcfg do-configure do-install
+fake: bbrebuild
include ${TOPDIR}/mk/pkg-bottom.mk