Commit b6c7e4b1 authored by Damien George's avatar Damien George
Browse files

all: Use full path name when including mp-readline/timeutils/netutils.

This follows the pattern of how all other headers are now included, and
makes it explicit where the header file comes from.  This patch also
removes -I options from Makefile's that specify the mp-readline/timeutils/
netutils directories, which are no longer needed.
parent 6e6c01b9
...@@ -18,9 +18,6 @@ APP_INC += -Iutil ...@@ -18,9 +18,6 @@ APP_INC += -Iutil
APP_INC += -Ibootmgr APP_INC += -Ibootmgr
APP_INC += -I$(BUILD) APP_INC += -I$(BUILD)
APP_INC += -I$(BUILD)/genhdr APP_INC += -I$(BUILD)/genhdr
APP_INC += -I../lib/mp-readline
APP_INC += -I../lib/netutils
APP_INC += -I../lib/timeutils
APP_INC += -I../stmhal APP_INC += -I../stmhal
APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#include "py/obj.h" #include "py/obj.h"
#include "lib/timeutils/timeutils.h"
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "extmod/vfs.h" #include "extmod/vfs.h"
#include "extmod/vfs_fat.h" #include "extmod/vfs_fat.h"
...@@ -48,7 +49,6 @@ ...@@ -48,7 +49,6 @@
#include "fifo.h" #include "fifo.h"
#include "socketfifo.h" #include "socketfifo.h"
#include "updater.h" #include "updater.h"
#include "timeutils.h"
#include "moduos.h" #include "moduos.h"
/****************************************************************************** /******************************************************************************
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "py/objtuple.h" #include "py/objtuple.h"
#include "py/objstr.h" #include "py/objstr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "lib/timeutils/timeutils.h"
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "lib/oofatfs/diskio.h" #include "lib/oofatfs/diskio.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
...@@ -43,7 +44,6 @@ ...@@ -43,7 +44,6 @@
#include "random.h" #include "random.h"
#include "mpexception.h" #include "mpexception.h"
#include "version.h" #include "version.h"
#include "timeutils.h"
#include "pybsd.h" #include "pybsd.h"
#include "pybuart.h" #include "pybuart.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "py/objstr.h" #include "py/objstr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stream.h" #include "py/stream.h"
#include "netutils.h" #include "lib/netutils/netutils.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modusocket.h" #include "modusocket.h"
#include "mpexception.h" #include "mpexception.h"
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include "py/obj.h" #include "py/obj.h"
#include "py/smallint.h" #include "py/smallint.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "lib/timeutils/timeutils.h"
#include "extmod/utime_mphal.h" #include "extmod/utime_mphal.h"
#include "timeutils.h"
#include "inc/hw_types.h" #include "inc/hw_types.h"
#include "inc/hw_ints.h" #include "inc/hw_ints.h"
#include "inc/hw_memmap.h" #include "inc/hw_memmap.h"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "lib/timeutils/timeutils.h"
#include "inc/hw_types.h" #include "inc/hw_types.h"
#include "inc/hw_ints.h" #include "inc/hw_ints.h"
#include "inc/hw_memmap.h" #include "inc/hw_memmap.h"
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
#include "pybrtc.h" #include "pybrtc.h"
#include "mpirq.h" #include "mpirq.h"
#include "pybsleep.h" #include "pybsleep.h"
#include "timeutils.h"
#include "simplelink.h" #include "simplelink.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modwlan.h" #include "modwlan.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/gc.h" #include "py/gc.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "lib/mp-readline/readline.h"
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "lib/oofatfs/diskio.h" #include "lib/oofatfs/diskio.h"
#include "extmod/vfs.h" #include "extmod/vfs.h"
...@@ -51,7 +52,6 @@ ...@@ -51,7 +52,6 @@
#include "lib/utils/pyexec.h" #include "lib/utils/pyexec.h"
#include "gccollect.h" #include "gccollect.h"
#include "gchelper.h" #include "gchelper.h"
#include "readline.h"
#include "mperror.h" #include "mperror.h"
#include "simplelink.h" #include "simplelink.h"
#include "modnetwork.h" #include "modnetwork.h"
......
...@@ -25,9 +25,6 @@ ESP_SDK = $(shell $(CC) -print-sysroot)/usr ...@@ -25,9 +25,6 @@ ESP_SDK = $(shell $(CC) -print-sysroot)/usr
INC += -I. INC += -I.
INC += -I.. INC += -I..
INC += -I../stmhal INC += -I../stmhal
INC += -I../lib/mp-readline
INC += -I../lib/netutils
INC += -I../lib/timeutils
INC += -I$(BUILD) INC += -I$(BUILD)
INC += -I$(ESP_SDK)/include INC += -I$(ESP_SDK)/include
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
*/ */
#include "py/obj.h" #include "py/obj.h"
#include "lib/timeutils/timeutils.h"
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "timeutils.h"
#include "modmachine.h" #include "modmachine.h"
DWORD get_fattime(void) { DWORD get_fattime(void) {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "timeutils.h" #include "lib/timeutils/timeutils.h"
#include "user_interface.h" #include "user_interface.h"
#include "modmachine.h" #include "modmachine.h"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "py/objlist.h" #include "py/objlist.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "netutils.h" #include "lib/netutils/netutils.h"
#include "queue.h" #include "queue.h"
#include "user_interface.h" #include "user_interface.h"
#include "espconn.h" #include "espconn.h"
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "py/smallint.h" #include "py/smallint.h"
#include "lib/timeutils/timeutils.h"
#include "modmachine.h" #include "modmachine.h"
#include "timeutils.h"
#include "user_interface.h" #include "user_interface.h"
#include "extmod/utime_mphal.h" #include "extmod/utime_mphal.h"
......
...@@ -14,7 +14,6 @@ INC += -I. ...@@ -14,7 +14,6 @@ INC += -I.
INC += -I.. INC += -I..
INC += -I$(MPTOP) INC += -I$(MPTOP)
INC += -I$(MPTOP)/unix INC += -I$(MPTOP)/unix
#INC += -I../lib/timeutils
INC += -I$(BUILD) INC += -I$(BUILD)
# compiler settings # compiler settings
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "py/mperrno.h" #include "py/mperrno.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "netutils.h" #include "lib/netutils/netutils.h"
#include "lwip/init.h" #include "lwip/init.h"
#include "lwip/timers.h" #include "lwip/timers.h"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#include "py/repl.h" #include "py/repl.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "readline.h" #include "lib/mp-readline/readline.h"
#if 0 // print debugging info #if 0 // print debugging info
#define DEBUG_PRINT (1) #define DEBUG_PRINT (1)
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "py/obj.h" #include "py/obj.h"
#include "py/nlr.h" #include "py/nlr.h"
#include "netutils.h" #include "lib/netutils/netutils.h"
// Takes an array with a raw IPv4 address and returns something like '192.168.0.1'. // Takes an array with a raw IPv4 address and returns something like '192.168.0.1'.
mp_obj_t netutils_format_ipv4_addr(uint8_t *ip, netutils_endian_t endian) { mp_obj_t netutils_format_ipv4_addr(uint8_t *ip, netutils_endian_t endian) {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "py/obj.h" #include "py/obj.h"
#include "timeutils.h" #include "lib/timeutils/timeutils.h"
// LEAPOCH corresponds to 2000-03-01, which is a mod-400 year, immediately // LEAPOCH corresponds to 2000-03-01, which is a mod-400 year, immediately
// after Feb 29. We calculate seconds as a signed integer relative to that. // after Feb 29. We calculate seconds as a signed integer relative to that.
......
...@@ -14,7 +14,6 @@ endif ...@@ -14,7 +14,6 @@ endif
INC += -I. INC += -I.
INC += -I.. INC += -I..
INC += -I../lib/mp-readline
INC += -I../stmhal INC += -I../stmhal
INC += -I$(BUILD) INC += -I$(BUILD)
......
...@@ -14,7 +14,6 @@ PART = 33FJ256GP506 ...@@ -14,7 +14,6 @@ PART = 33FJ256GP506
INC += -I. INC += -I.
INC += -I.. INC += -I..
INC += -I../lib/mp-readline
INC += -I../stmhal INC += -I../stmhal
INC += -I$(BUILD) INC += -I$(BUILD)
INC += -I$(XC16)/include INC += -I$(XC16)/include
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "py/mphal.h" #include "py/mphal.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "lib/utils/pyexec.h" #include "lib/utils/pyexec.h"
#include "readline.h" #include "lib/mp-readline/readline.h"
#include "board.h" #include "board.h"
#include "modpyb.h" #include "modpyb.h"
......
Supports Markdown
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