Change autobuild targets to avoid files remove

Change targets in autobuild scripts
to dispatch builds in differents build directory
Avoid remove of Makefile and CMakeCache from each target

Bug-AGL: SPEC-2049

Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
Change-Id: I08033b3409e308799010c5925be0ae1b455500ed

2 files changed, 115 insertions, 130 deletions

diff --git a/src/template.d/autobuild/agl/autobuild.in b/src/template.d/autobuild/agl/autobuild.in
index 403b967..7816b3d 100755
--- a/src/template.d/autobuild/agl/autobuild.in
+++ b/src/template.d/autobuild/agl/autobuild.in
@@ -16,10 +16,14 @@
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
+BUILD_DIR_TEST := $(abspath $(dir $(THISFILE))/../../build-test)
+BUILD_DIR_DEBUG := $(abspath $(dir $(THISFILE))/../../build-debug)
+BUILD_DIR_COVERAGE := $(abspath $(dir $(THISFILE))/../../build-coverage)
+BUILD_DIR_DEBUG_TEST := $(abspath $(dir $(THISFILE))/../../build-debug-test)
+BUILD_DIR_COVERAGE_TEST := $(abspath $(dir $(THISFILE))/../../build-coverage-test)
 DEST      := ${BUILD_DIR}
 
-.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all package-all-1 package-all-2
-
+.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all
 all: help
 
 help:
@@ -50,25 +54,25 @@ configure:
 	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
 
 configure-test:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
+	@[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST}
+	@[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
 
 configure-debug:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=DEBUG ${CONFIGURE_ARGS} ..)
+	@[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG}
+	@[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && cmake -DCMAKE_BUILD_TYPE=DEBUG ${CONFIGURE_ARGS} ..)
 
 configure-coverage:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=COVERAGE ${CONFIGURE_ARGS} ..)
+	@[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE}
+	@[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && cmake -DCMAKE_BUILD_TYPE=COVERAGE ${CONFIGURE_ARGS} ..)
 
 build: configure
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
 
 build-test: configure-test
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+	@cmake --build ${BUILD_DIR_TEST} ${BUILD_ARGS} --target all
 
 build-debug: configure-debug
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+	@cmake --build ${BUILD_DIR_DEBUG} ${BUILD_ARGS} --target all
 
 build-coverage: configure-coverage
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
@@ -83,77 +87,65 @@ package: build
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-test: build-test
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_TEST}/$@/bin
+	@mkdir -p ${BUILD_DIR_TEST}/$@/etc
+	@mkdir -p ${BUILD_DIR_TEST}/$@/lib
+	@mkdir -p ${BUILD_DIR_TEST}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_TEST}/$@/var
+	@cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-debug: build-debug
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/bin
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/etc
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/lib
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/var
+	@cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target widget
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage: build-coverage
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/bin
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/etc
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/lib
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/var
+	@cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target widget
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage-test: build-coverage
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/bin
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/etc
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/lib
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/var
+	@cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE_TEST}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 
 package-debug-test: build-debug
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/bin
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/etc
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/lib
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/var
+	@cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG_TEST}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-all: package package-test package-coverage package-debug
 
diff --git a/src/template.d/autobuild/linux/autobuild.in b/src/template.d/autobuild/linux/autobuild.in
index 9d6bc88..7816b3d 100755
--- a/src/template.d/autobuild/linux/autobuild.in
+++ b/src/template.d/autobuild/linux/autobuild.in
@@ -16,10 +16,14 @@
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
+BUILD_DIR_TEST := $(abspath $(dir $(THISFILE))/../../build-test)
+BUILD_DIR_DEBUG := $(abspath $(dir $(THISFILE))/../../build-debug)
+BUILD_DIR_COVERAGE := $(abspath $(dir $(THISFILE))/../../build-coverage)
+BUILD_DIR_DEBUG_TEST := $(abspath $(dir $(THISFILE))/../../build-debug-test)
+BUILD_DIR_COVERAGE_TEST := $(abspath $(dir $(THISFILE))/../../build-coverage-test)
 DEST      := ${BUILD_DIR}
 
-.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all package-all-1 package-all-2
-
+.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all
 all: help
 
 help:
@@ -50,25 +54,25 @@ configure:
 	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
 
 configure-test:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
+	@[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST}
+	@[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
 
 configure-debug:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=DEBUG ${CONFIGURE_ARGS} ..)
+	@[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG}
+	@[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && cmake -DCMAKE_BUILD_TYPE=DEBUG ${CONFIGURE_ARGS} ..)
 
 configure-coverage:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=COVERAGE ${CONFIGURE_ARGS} ..)
+	@[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE}
+	@[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && cmake -DCMAKE_BUILD_TYPE=COVERAGE ${CONFIGURE_ARGS} ..)
 
 build: configure
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
 
 build-test: configure-test
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+	@cmake --build ${BUILD_DIR_TEST} ${BUILD_ARGS} --target all
 
 build-debug: configure-debug
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+	@cmake --build ${BUILD_DIR_DEBUG} ${BUILD_ARGS} --target all
 
 build-coverage: configure-coverage
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
@@ -83,76 +87,65 @@ package: build
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-test: build-test
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_TEST}/$@/bin
+	@mkdir -p ${BUILD_DIR_TEST}/$@/etc
+	@mkdir -p ${BUILD_DIR_TEST}/$@/lib
+	@mkdir -p ${BUILD_DIR_TEST}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_TEST}/$@/var
+	@cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-debug: build-debug
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/bin
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/etc
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/lib
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_DEBUG}/$@/var
+	@cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target widget
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage: build-coverage
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/bin
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/etc
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/lib
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_COVERAGE}/$@/var
+	@cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target widget
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage-test: build-coverage
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/bin
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/etc
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/lib
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/var
+	@cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE_TEST}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
+
 
 package-debug-test: build-debug
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/var
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
-	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/bin
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/etc
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/lib
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/htdocs
+	@mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/var
+	@cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG_TEST}/*.wgt ${DEST}; \
 	fi
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-all: package package-test package-coverage package-debug