From 8df1d5e37c8234af8632d9172056684b0b6a84d8 Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sun, 21 Aug 2016 15:31:47 +0200 Subject: [PATCH 1/2] Bump esp82xx version --- embedded8266/esp82xx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded8266/esp82xx b/embedded8266/esp82xx index 8d5d658..a863e69 160000 --- a/embedded8266/esp82xx +++ b/embedded8266/esp82xx @@ -1 +1 @@ -Subproject commit 8d5d6580244df6ce0462be6ce91f109d672b2e36 +Subproject commit a863e6984ed0fb5617983e4cae185871d5f0fff6 From 874d88fbf36ea82c18247699c1375b4caafe3e2f Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sun, 21 Aug 2016 15:33:44 +0200 Subject: [PATCH 2/2] Auto-pull esp82xx --- embedded8266/Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/embedded8266/Makefile b/embedded8266/Makefile index 5e9de5c..ba627d1 100644 --- a/embedded8266/Makefile +++ b/embedded8266/Makefile @@ -1,6 +1,10 @@ include user.cfg -include esp82xx/common.mf -include esp82xx/main.mf +-include esp82xx/common.mf +-include esp82xx/main.mf + +% : + $(warning This is the empty rule. Something went wrong.) + @true SRCS += user/ws2812_i2s.c \ user/hpatimer.c \ @@ -12,14 +16,8 @@ SRCS += user/ws2812_i2s.c \ LDFLAGS_CORE += -Wl,-Map,output.map -#Useful git commands ifndef TARGET -# Fetch submodule if the user forgot to clone with `--recursive` -GETSUBMODS = all burn burnweb netweb netburn clean cleanall purge -.PHONY : $(GETSUBMODS) -$(GETSUBMODS) : - $(warning Submodule esp82xx was not fetched. Trying it now.) - git submodule update --init --recursive - $(info Re-unning make...) - make $@ $(MFLAGS) $(MAKEOVERRIDES) +$(info Modules were not checked out... use git clone --recursive in the future. Pulling now.) +$(shell git submodule update --init --recursive) endif +