Header files re-arrangement

common.mk

@@ -177,7 +177,7 @@ IMGTOOL_ARGS=-$(IMGTOOL_FLASH_SIZE) -$(FLASH_MODE) -$(FLASH_SPEED)
 # Placing $(PROGRAM_DIR) and $(PROGRAM_DIR)include first allows
 # programs to have their own copies of header config files for components
 # , which is useful for overriding things.
-INC_DIRS      = $(PROGRAM_DIR) $(PROGRAM_DIR)include $(ROOT)include $(ROOT)extras
+INC_DIRS      = $(PROGRAM_DIR) $(PROGRAM_DIR)include $(ROOT)include
 
 ifeq ($(OWN_LIBC),1)
     INC_DIRS += $(ROOT)libc/xtensa-lx106-elf/include

examples/cpp_01_tasks/Makefile

@@ -1,3 +1,5 @@
 # Simple makefile for simple example
 PROGRAM=cpp_01_tasks
+OTA=0
+EXTRA_COMPONENTS=extras/cpp_support
 include ../../common.mk

examples/cpp_01_tasks/main.cpp

@@ -26,9 +26,9 @@
  * 
  */
 
-#include "cplusplus/cplusplus.hpp"
+#include "cplusplus.hpp"
-#include "thread/task.hpp"
+#include "task.hpp"
-#include "thread/queue.hpp"
+#include "queue.hpp"
 
 #include "espressif/esp_common.h"
 

extras/cpp_support/component.mk

@@ -0,0 +1,8 @@
+# Component makefile for extras/cpp_support
+INC_DIRS += $(ROOT)extras/cpp_support/include
+
+# args for passing into compile rule generation
+# extras/mqtt-client_INC_DIR =  $(ROOT)extras/mqtt-client
+# extras/mqtt-client_SRC_DIR =  $(ROOT)extras/mqtt-client
+
+# $(eval $(call component_compile_rules,extras/mqtt-client))