all: Update to point to files in new shared/ directory.

Signed-off-by: Damien George <damien@micropython.org>

7 files changed, 8 insertions, 8 deletions

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index a54047519..9ea2ba0af 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -4,8 +4,8 @@ set(MICROPY_EXTMOD_DIR "${MICROPY_DIR}/extmod")
 set(MICROPY_OOFATFS_DIR "${MICROPY_DIR}/lib/oofatfs")
 
 set(MICROPY_SOURCE_EXTMOD
-    ${MICROPY_DIR}/lib/embed/abort_.c
-    ${MICROPY_DIR}/lib/utils/printf.c
+    ${MICROPY_DIR}/shared/libc/abort_.c
+    ${MICROPY_DIR}/shared/libc/printf.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index b000b058d..ff24a549a 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -153,7 +153,7 @@ LWIP_DIR = lib/lwip/src
 INC += -I$(TOP)/$(LWIP_DIR)/include
 CFLAGS_MOD += -DMICROPY_PY_LWIP=1
 $(BUILD)/$(LWIP_DIR)/core/ipv4/dhcp.o: CFLAGS_MOD += -Wno-address
-SRC_MOD += extmod/modlwip.c lib/netutils/netutils.c
+SRC_MOD += extmod/modlwip.c shared/netutils/netutils.c
 SRC_MOD += $(addprefix $(LWIP_DIR)/,\
 	apps/mdns/mdns.c \
 	core/def.c \
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 1d557a6a8..00fd10964 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -35,7 +35,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 
 #include "lwip/init.h"
 #include "lwip/tcp.h"
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index b66180387..d55767de2 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -33,7 +33,7 @@
 #include "py/objarray.h"
 #include "py/stream.h"
 #include "extmod/misc.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 #if MICROPY_PY_OS_DUPTERM
 
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 644be57ae..41284500b 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -37,7 +37,7 @@
 #include "py/mperrno.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs_fat.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 #if FF_MAX_SS == FF_MIN_SS
 #define SECSIZE(fs) (FF_MIN_SS)
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index dd78269a4..f6a9a2462 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_lfs.h"
 
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index f865e4606..e1324f82c 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -34,7 +34,7 @@
 #include "py/objstr.h"
 #include "py/mperrno.h"
 #include "extmod/vfs.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, int arg, bool must_return_int) {
     mp_obj_t ret = mp_vfs_blockdev_ioctl(c->context, cmd, arg);