From 49be64a716d1b891db6ef3d96304983e7d42cb7d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Mon, 12 Dec 2016 10:02:41 +1100
Subject: [PATCH 1/2] build system: Generate dependency make rules for
 assembler source

Was previously only C, C++.
---
 make/project.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/make/project.mk b/make/project.mk
index fd45600a03..0548002277 100644
--- a/make/project.mk
+++ b/make/project.mk
@@ -172,7 +172,7 @@ LDFLAGS ?= -nostdlib \
 
 # CPPFLAGS used by C preprocessor
 # If any flags are defined in application Makefile, add them at the end. 
-CPPFLAGS := -DESP_PLATFORM $(CPPFLAGS) $(EXTRA_CPPFLAGS)
+CPPFLAGS := -DESP_PLATFORM -MMD -MP $(CPPFLAGS) $(EXTRA_CPPFLAGS)
 
 # Warnings-related flags relevant both for C and C++
 COMMON_WARNING_FLAGS = -Wall -Werror=all \
@@ -188,8 +188,7 @@ COMMON_FLAGS = \
 	-ffunction-sections -fdata-sections \
 	-fstrict-volatile-bitfields \
 	-mlongcalls \
-	-nostdlib \
-	-MMD -MP
+	-nostdlib
 
 # Optimization flags are set based on menuconfig choice
 ifneq ("$(CONFIG_OPTIMIZATION_LEVEL_RELEASE)","")

From 4f637034e8d4dd06c30eeac0154c07cd6eebccdc Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Thu, 8 Dec 2016 07:32:36 +1100
Subject: [PATCH 2/2] build system tests: Add test case for sdkconfig-triggered
 recompilation

---
 make/test_build_system.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/make/test_build_system.sh b/make/test_build_system.sh
index d449fa9614..5d24e2a948 100755
--- a/make/test_build_system.sh
+++ b/make/test_build_system.sh
@@ -155,6 +155,17 @@ function run_tests()
     assert_rebuilt ${APP_BINS}
     assert_not_rebuilt ${BOOTLOADER_BINS}
 
+    print_status "sdkconfig update triggers recompiles"
+    make
+    take_build_snapshot
+    touch sdkconfig
+    make
+    # pick one each of .c, .cpp, .S that #includes sdkconfig.h
+    # and therefore should rebuild
+    assert_rebuilt newlib/syscall_table.o
+    assert_rebuilt nvs_flash/src/nvs_api.o
+    assert_rebuilt freertos/xtensa_vectors.o
+
     print_status "All tests completed"
     if [ -n "${FAILURES}" ]; then
         echo "Some failures were detected:"