'make clean' fixes

pull/977/head
Jesse Vincent 4 years ago
parent 6829f3497b
commit b2e899429f
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -71,6 +71,10 @@ endif
include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
clean:
$(MAKE) -C tests clean
rm -rf testing/googletest/build/*
prepare-virtual: prepare-virtual:
$(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual $(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual

@ -15,17 +15,21 @@ all: ${TESTS}
done done
cmake-clean: cmake-clean:
-${MAKE} clean rm -rf "${top_dir}/testing/googletest/build/*"
rm -rf ../testing/googletest/build
clean: ../testing/googletest/build/Makefile clean: cmake-clean
rm -rf "${build_dir}" # ${top_dir}/testing/googletest/build/Makefile
@for test in ${TESTS}; do \
${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} top_dir=${top_dir} testcase=$${test} clean; \
done
rm -rf "${build_dir}/*"
googletest: ../testing/googletest/build/Makefile googletest: ${top_dir}/testing/googletest/build/Makefile
cd ../testing/googletest/build && $(MAKE) cd ${top_dir}/testing/googletest/build && $(MAKE)
../testing/googletest/build/Makefile: ${top_dir}/testing/googletest/build/Makefile:
install -d ../testing/googletest/build && cd ../testing/googletest/build && cmake .. install -d ${top_dir}/testing/googletest/build && cd ${top_dir}/testing/googletest/build && cmake ..
${libcommon_a}: ${libcommon_a}:
${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing ${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing

Loading…
Cancel
Save