Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
98c2c052
Unverified
Commit
98c2c052
authored
Jul 23, 2019
by
Terry Ellison
Committed by
GitHub
Jul 23, 2019
Browse files
Dev make cleanup (#2842)
parent
f7a545b9
Changes
56
Show whitespace changes
Inline
Side-by-side
app/mbedtls/library/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
./
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/mbedtls/platform/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
./
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/modules/Makefile
View file @
98c2c052
...
@@ -25,6 +25,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -25,6 +25,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# for a subtree within the makefile rooted therein
# for a subtree within the makefile rooted therein
#
#
#DEFINES +=
#DEFINES +=
CONFIGURATION_DEFINES
+=
-DMBEDTLS_USER_CONFIG_FILE
=
\"
user_mbedtls.h
\"
#############################################################
#############################################################
# Recursion Magic - Don't touch this!!
# Recursion Magic - Don't touch this!!
...
@@ -38,25 +39,8 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -38,25 +39,8 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
../u8g2lib/u8g2/src/clib
-I
../ucglib/ucg/src/clib
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
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/modules/coap.c
View file @
98c2c052
...
@@ -13,12 +13,12 @@
...
@@ -13,12 +13,12 @@
#include "espconn.h"
#include "espconn.h"
#include "driver/uart.h"
#include "driver/uart.h"
#include "coap.h"
#include "coap
/coap
.h"
#include "uri.h"
#include "
coap/
uri.h"
#include "node.h"
#include "
coap/
node.h"
#include "coap_timer.h"
#include "coap
/coap
_timer.h"
#include "coap_io.h"
#include "coap
/coap
_io.h"
#include "coap_server.h"
#include "coap
/coap
_server.h"
coap_queue_t
*
gQueue
=
NULL
;
coap_queue_t
*
gQueue
=
NULL
;
...
...
app/modules/dht.c
View file @
98c2c052
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include "lauxlib.h"
#include "lauxlib.h"
#include "platform.h"
#include "platform.h"
#include "cpu_esp8266.h"
#include "cpu_esp8266.h"
#include "dht.h"
#include "dht
/dht
.h"
#define NUM_DHT GPIO_PIN_NUM
#define NUM_DHT GPIO_PIN_NUM
...
...
app/modules/http.c
View file @
98c2c052
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include "lauxlib.h"
#include "lauxlib.h"
#include "platform.h"
#include "platform.h"
#include "cpu_esp8266.h"
#include "cpu_esp8266.h"
#include "httpclient.h"
#include "
http/
httpclient.h"
static
int
http_callback_registry
=
LUA_NOREF
;
static
int
http_callback_registry
=
LUA_NOREF
;
...
...
app/modules/mqtt.c
View file @
98c2c052
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
#include "lwip/ip_addr.h"
#include "lwip/ip_addr.h"
#include "espconn.h"
#include "espconn.h"
#include "mqtt_msg.h"
#include "mqtt
/mqtt
_msg.h"
#include "msg_queue.h"
#include "
mqtt/
msg_queue.h"
#include "user_interface.h"
#include "user_interface.h"
...
...
app/modules/pcm.c
View file @
98c2c052
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
#include <string.h>
#include <string.h>
#include <stdlib.h>
#include <stdlib.h>
#include "pcm.h"
#include "pcm
/pcm
.h"
#include "pcm_drv.h"
#include "pcm
/pcm
_drv.h"
#define GET_PUD() pud_t *pud = (pud_t *)luaL_checkudata(L, 1, "pcm.driver"); \
#define GET_PUD() pud_t *pud = (pud_t *)luaL_checkudata(L, 1, "pcm.driver"); \
...
...
app/modules/sjson.c
View file @
98c2c052
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
#include <limits.h>
#include <limits.h>
#endif
#endif
#include "json_config.h"
#include "
sjson/
json_config.h"
#include "jsonsl.h"
#include "
sjson/
jsonsl.h"
#define LUA_SJSONLIBNAME "sjson"
#define LUA_SJSONLIBNAME "sjson"
...
...
app/modules/sqlite3.c
View file @
98c2c052
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
#endif
#endif
#endif
#endif
#include "sqlite3.h"
#include "sqlite3
/sqlite3
.h"
/* compile time features */
/* compile time features */
#if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)
#if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)
...
...
app/modules/websocket.c
View file @
98c2c052
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <string.h>
#include <string.h>
#include <stddef.h>
#include <stddef.h>
#include "websocketclient.h"
#include "
websocket/
websocketclient.h"
#define METATABLE_WSCLIENT "websocket.client"
#define METATABLE_WSCLIENT "websocket.client"
...
...
app/modules/wifi.c
View file @
98c2c052
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
#ifdef WIFI_SMART_ENABLE
#ifdef WIFI_SMART_ENABLE
#include "smart.h"
#include "smart
/smart
.h"
#include "smartconfig.h"
#include "
smart/
smartconfig.h"
static
int
wifi_smart_succeed
=
LUA_NOREF
;
static
int
wifi_smart_succeed
=
LUA_NOREF
;
#endif
#endif
...
...
app/modules/wifi_eventmon.c
View file @
98c2c052
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
#include <stdint.h>
#include <stdint.h>
#include "user_interface.h"
#include "user_interface.h"
#include "smart.h"
#include "smart
/smart
.h"
#include "smartconfig.h"
#include "smartconfig.h"
#include "user_config.h"
#include "user_config.h"
...
...
app/mqtt/Makefile
View file @
98c2c052
...
@@ -38,9 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -38,9 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
./
INCLUDES
+=
-I
../libc
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/net/Makefile
View file @
98c2c052
...
@@ -36,9 +36,6 @@ endif
...
@@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
./
INCLUDES
+=
-I
../libc
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/pcm/Makefile
View file @
98c2c052
...
@@ -38,10 +38,5 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -38,10 +38,5 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
# 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)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/platform/Makefile
View file @
98c2c052
...
@@ -38,13 +38,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -38,13 +38,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
../spiffs
-I
../u8g2lib/u8g2/src/clib
-I
../ucglib/ucg/src/clib
INCLUDES
+=
-I
./
INCLUDES
+=
-I
../spiffs
INCLUDES
+=
-I
../libc
INCLUDES
+=
-I
../lua
INCLUDES
+=
-I
../u8g2lib/u8g2/src/clib
INCLUDES
+=
-I
../ucglib/ucg/src/clib
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/pm/Makefile
View file @
98c2c052
...
@@ -38,15 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -38,15 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent
# 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)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/sjson/Makefile
View file @
98c2c052
...
@@ -37,11 +37,6 @@ DEFINES += -include memcompat.h -include json_config.h
...
@@ -37,11 +37,6 @@ DEFINES += -include memcompat.h -include json_config.h
# Required for each makefile to inherit from the parent
# 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)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
app/smart/Makefile
View file @
98c2c052
...
@@ -36,9 +36,6 @@ endif
...
@@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent
# Required for each makefile to inherit from the parent
#
#
INCLUDES
:=
$(INCLUDES)
-I
$(PDIR)
include
INCLUDES
+=
-I
./
INCLUDES
+=
-I
../libc
PDIR
:=
../
$(PDIR)
PDIR
:=
../
$(PDIR)
sinclude
$(PDIR)Makefile
sinclude
$(PDIR)Makefile
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment