Unverified Commit 98c2c052 authored by Terry Ellison's avatar Terry Ellison Committed by GitHub
Browse files

Dev make cleanup (#2842)

parent f7a545b9
......@@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -25,6 +25,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# for a subtree within the makefile rooted therein
#
#DEFINES +=
CONFIGURATION_DEFINES += -DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\"
#############################################################
# Recursion Magic - Don't touch this!!
......@@ -38,25 +39,8 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
INCLUDES += -I ../coap
INCLUDES += -I ../mqtt
INCLUDES += -I ../u8g2lib/u8g2/src/clib
INCLUDES += -I ../ucglib/ucg/src/clib
INCLUDES += -I ../lua
INCLUDES += -I ../pcm
INCLUDES += -I ../platform
INCLUDES += -I ../spiffs
INCLUDES += -I ../smart
INCLUDES += -I ../dht
INCLUDES += -I ../fatfs
INCLUDES += -I ../http
INCLUDES += -I ../sjson
INCLUDES += -I ../websocket
INCLUDES += -I ../pm
INCLUDES += -I ../sqlite3
INCLUDES += -I ../u8g2lib/u8g2/src/clib -I ../ucglib/ucg/src/clib
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -13,12 +13,12 @@
#include "espconn.h"
#include "driver/uart.h"
#include "coap.h"
#include "uri.h"
#include "node.h"
#include "coap_timer.h"
#include "coap_io.h"
#include "coap_server.h"
#include "coap/coap.h"
#include "coap/uri.h"
#include "coap/node.h"
#include "coap/coap_timer.h"
#include "coap/coap_io.h"
#include "coap/coap_server.h"
coap_queue_t *gQueue = NULL;
......
......@@ -4,7 +4,7 @@
#include "lauxlib.h"
#include "platform.h"
#include "cpu_esp8266.h"
#include "dht.h"
#include "dht/dht.h"
#define NUM_DHT GPIO_PIN_NUM
......
......@@ -8,7 +8,7 @@
#include "lauxlib.h"
#include "platform.h"
#include "cpu_esp8266.h"
#include "httpclient.h"
#include "http/httpclient.h"
static int http_callback_registry = LUA_NOREF;
......
......@@ -12,8 +12,8 @@
#include "lwip/ip_addr.h"
#include "espconn.h"
#include "mqtt_msg.h"
#include "msg_queue.h"
#include "mqtt/mqtt_msg.h"
#include "mqtt/msg_queue.h"
#include "user_interface.h"
......
......@@ -6,8 +6,8 @@
#include <string.h>
#include <stdlib.h>
#include "pcm.h"
#include "pcm_drv.h"
#include "pcm/pcm.h"
#include "pcm/pcm_drv.h"
#define GET_PUD() pud_t *pud = (pud_t *)luaL_checkudata(L, 1, "pcm.driver"); \
......
......@@ -11,8 +11,8 @@
#include <limits.h>
#endif
#include "json_config.h"
#include "jsonsl.h"
#include "sjson/json_config.h"
#include "sjson/jsonsl.h"
#define LUA_SJSONLIBNAME "sjson"
......
......@@ -59,7 +59,7 @@
#endif
#endif
#include "sqlite3.h"
#include "sqlite3/sqlite3.h"
/* compile time features */
#if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)
......
......@@ -17,7 +17,7 @@
#include <string.h>
#include <stddef.h>
#include "websocketclient.h"
#include "websocket/websocketclient.h"
#define METATABLE_WSCLIENT "websocket.client"
......
......@@ -16,8 +16,8 @@
#ifdef WIFI_SMART_ENABLE
#include "smart.h"
#include "smartconfig.h"
#include "smart/smart.h"
#include "smart/smartconfig.h"
static int wifi_smart_succeed = LUA_NOREF;
#endif
......
......@@ -9,7 +9,7 @@
#include <stdint.h>
#include "user_interface.h"
#include "smart.h"
#include "smart/smart.h"
#include "smartconfig.h"
#include "user_config.h"
......
......@@ -38,9 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -38,10 +38,5 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../lua
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -38,13 +38,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../spiffs
INCLUDES += -I ../libc
INCLUDES += -I ../lua
INCLUDES += -I ../u8g2lib/u8g2/src/clib
INCLUDES += -I ../ucglib/ucg/src/clib
INCLUDES += -I ../spiffs -I ../u8g2lib/u8g2/src/clib -I ../ucglib/ucg/src/clib
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -38,15 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
INCLUDES += -I ../lua
INCLUDES += -I ../platform
INCLUDES += -I ../libc
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -37,11 +37,6 @@ DEFINES += -include memcompat.h -include json_config.h
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
......@@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent
#
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment