From 4893f466c54b0dc48e97f785fa6b1b5b1e01e4ca Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 16 Mar 2014 22:24:17 +0100
Subject: remove cleantarget at the moment

we share all toolchains in host_<gnu_host_name> directory,
so the existing cleantarget does not work as expected.

remove it for now.
---
 Makefile                       |  7 +------
 docs/customize-libc-config.txt |  2 +-
 docs/make-tips.txt             |  9 ++-------
 mk/build.mk                    | 15 +++------------
 mk/vars.mk                     |  1 -
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 8ca346b8b..8c603e196 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,7 @@ help:
 	@echo '  kernelconfig - Modify the target kernel configuration'
 	@echo ''
 	@echo 'Cleaning targets:'
-	@echo '  clean        - Remove bin and build_dir directories'
-	@echo '  cleantarget  - Same as "clean", but also remove toolchain for target'
+	@echo '  clean        - Remove firmware and build directories'
 	@echo '  cleandir     - Same as "clean", but also remove all built toolchains'
 	@echo '  cleankernel  - Remove kernel dir, useful if you changed any kernel patches'
 	@echo '  distclean    - Same as "cleandir", but also remove downloaded'
@@ -100,10 +99,6 @@ cleandir dirclean: .prereq_done
 	-@${GMAKE_INV} cleandir
 	@-rm -f make.log .prereq_done
 
-cleantarget targetclean: .prereq_done
-	-@${GMAKE_INV} cleantarget
-	@-rm -f make.log
-
 cleantoolchain toolchainclean: .prereq_done
 	-@${GMAKE_INV} cleantoolchain
 
diff --git a/docs/customize-libc-config.txt b/docs/customize-libc-config.txt
index 075a272a0..438e630f8 100644
--- a/docs/customize-libc-config.txt
+++ b/docs/customize-libc-config.txt
@@ -27,7 +27,7 @@ and rebuild your targetsystem, including the toolchain components:
 
 ----------------
  $ cp .config ../target/<arch>/uclibc.config
- $ cd .. && make cleantarget && make
+ $ cd .. && make cleandir && make
 ----------------
 
 There are no customization options for GNU libc or musl available.
diff --git a/docs/make-tips.txt b/docs/make-tips.txt
index 787121cb4..f508633e9 100644
--- a/docs/make-tips.txt
+++ b/docs/make-tips.txt
@@ -42,13 +42,8 @@ and pkg trees, the firmware and the toolchain for all targets):
  $ make cleandir
 --------------------
 
-If you only want to clean your specific configured target, just use:
-
---------------------
- $ make cleantarget
---------------------
-
-If you even want to clean any downloaded source:
+If you even want to clean any downloaded source and your 
+confiuration +.config+:
 
 --------------------
  $ make distclean
diff --git a/mk/build.mk b/mk/build.mk
index 90168586a..821548428 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -41,8 +41,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PKG_TEST=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
-			ADK_PKG_CONSOLE=n \
-			ADK_PKG_TEST=n \
 			ADK_TOOLCHAIN_GCC_USE_SSP=n \
 			ADK_TOOLCHAIN_GCC_USE_LTO=n \
 			BUSYBOX_IFPLUGD=n \
@@ -122,7 +120,7 @@ POSTCONFIG=		-@\
 			make kernelclean;\
 		fi; \
 		if [ "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config|md5sum)" != "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config.old|md5sum)" ];then \
-			echo "You should make cleantarget, after changing thumb mode";\
+			echo "You should make cleandir, after changing thumb mode";\
 		fi; \
 		if [ $$rebuild -eq 1 ];then \
 			cp .config .config.old;\
@@ -144,7 +142,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 	$(STAGING_HOST_DIR)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk
 
 .NOTPARALLEL:
-.PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean
+.PHONY: all world clean cleandir cleantoolchain distclean image_clean
 
 world:
 	mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
@@ -275,13 +273,6 @@ cleantoolchain:
 	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
 	@rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk
 
-cleantarget:
-	@$(TRACE) cleantarget
-	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
-	rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR)
-	rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_TARGET_DIR) $(STAGING_PKG_DIR)
-	rm -f .tmpconfig.h all.config .defconfig
-
 distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
@@ -593,7 +584,7 @@ bulkallmod:
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
-		$(GMAKE) cleantarget; \
+		$(GMAKE) clean; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
 	        if [ -f .exit ]; then break;fi \
diff --git a/mk/vars.mk b/mk/vars.mk
index 5fd4a51aa..f50038ea4 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -139,7 +139,6 @@ check_gcc=$(shell \
 CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,)
 
 # host compiler flags
-CXX_FOR_BUILD?=		g++
 CPPFLAGS_FOR_BUILD?=	-I$(STAGING_HOST_DIR)/usr/include
 CFLAGS_FOR_BUILD=	-O2 -Wall $(CF_FOR_BUILD)
 CXXFLAGS_FOR_BUILD?=    -O2 -Wall
-- 
cgit v1.2.3