From 6f006c25fb5a2b83361c670faf0865aa2d3ee8f2 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 9 Sep 2016 14:07:45 +1000 Subject: [PATCH] json & expat: Update component.mk after merging from master --- components/expat/{Makefile => component.mk} | 2 +- components/json/{Makefile => component.mk} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename components/expat/{Makefile => component.mk} (91%) rename components/json/{Makefile => component.mk} (90%) diff --git a/components/expat/Makefile b/components/expat/component.mk similarity index 91% rename from components/expat/Makefile rename to components/expat/component.mk index 81990aa599..69595d7b27 100644 --- a/components/expat/Makefile +++ b/components/expat/component.mk @@ -12,4 +12,4 @@ COMPONENT_SRCDIRS := library port CFLAGS += -Wno-error=address -Waddress -DHAVE_EXPAT_CONFIG_H -include $(IDF_PATH)/make/component.mk +include $(IDF_PATH)/make/component_common.mk diff --git a/components/json/Makefile b/components/json/component.mk similarity index 90% rename from components/json/Makefile rename to components/json/component.mk index ebddafdd1c..311a902f99 100644 --- a/components/json/Makefile +++ b/components/json/component.mk @@ -10,4 +10,4 @@ COMPONENT_ADD_INCLUDEDIRS := include port/include COMPONENT_SRCDIRS := library port -include $(IDF_PATH)/make/component.mk +include $(IDF_PATH)/make/component_common.mk