diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-30 18:35:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-30 18:35:58 +0100 |
| commit | 5df306b0c9d713021edd9d81ff8f37b5d7f01db5 (patch) | |
| tree | dbbdf0bbf67ec043ef84e51a6e3977c42c996520 /mk/build.mk | |
| parent | 6e03bb38c5d0309200152a1293d87f09c8545e13 (diff) | |
use target-libc combination for all builddirs
IMPORTANT: do a make distclean before compiling after
this commit.
The directories for all build and bin directories changed, so
that toolchains for different target-libc combinations can coexist.
This might be usefule in the future for continous compiling after
git commit, without rebuilding the toolchain.
Rework busybox rebuild, when config changes. Not optimal, but at least
working after this change to the directory structure.
Diffstat (limited to 'mk/build.mk')
| -rw-r--r-- | mk/build.mk | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/mk/build.mk b/mk/build.mk index e7d1f0ae0..5c26ea4c9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -57,10 +57,7 @@ noconfig_targets:= menuconfig \ distclean \ tags -MAKECLEANDIR_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ - ADK_TARGET_LIB_GLIBC \ - ADK_TARGET_LIB_ECLIBC \ - ADK_DEBUG +MAKECLEANDIR_SYMBOLS= ADK_DEBUG MAKECLEAN_SYMBOLS= ADK_TARGET_PACKAGE_IPKG \ ADK_TARGET_PACKAGE_RPM \ @@ -89,11 +86,7 @@ POSTCONFIG= -@ \ "$$what' might be required!"; \ break; \ done; \ - fi; \ - if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ - if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \ - rm build_*/w-busybox*/busybox*/.configure_done; \ - fi; \ + if [ -f .busyboxcfg ];then rm .busyboxcfg;fi; \ fi; \ fi @@ -238,14 +231,15 @@ cleandir: rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \ $(TOOLS_BUILD_DIR) rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \ - ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk + ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk \ + .busyboxcfg cleantarget: @$(TRACE) cleantarget @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) all.config .defconfig - rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk + rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk .busyboxcfg distclean: @$(TRACE) distclean @@ -254,7 +248,8 @@ distclean: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ - .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk + .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk \ + .busyboxcfg else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) |