summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-05-25 12:14:42 -0700
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-05-25 12:14:42 -0700
commitaaf01481aa5ded82a4706770f235c490649437bf (patch)
tree130bfc60bd0fcf5121245e708236949c88763fc9
parent32a4eb2c532e29957d8187d7c06ee95dc500489a (diff)
Change the approach for input so that its not included in every single build. Put it next to readline instead.
-rw-r--r--atmel-samd/Makefile1
-rw-r--r--esp8266/Makefile1
-rw-r--r--lib/mp-readline/builtin_input.c (renamed from py/builtininput.c)0
-rw-r--r--py/py.mk1
-rw-r--r--stmhal/Makefile1
-rw-r--r--teensy/Makefile1
6 files changed, 4 insertions, 1 deletions
diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile
index bbfa62a25..92b1e305b 100644
--- a/atmel-samd/Makefile
+++ b/atmel-samd/Makefile
@@ -223,6 +223,7 @@ SRC_C = \
lib/utils/pyhelp.c \
lib/utils/stdout_helpers.c \
lib/libc/string0.c \
+ lib/mp-readline/builtin_input.c \
lib/mp-readline/readline.c
STM_SRC_C = $(addprefix stmhal/,\
diff --git a/esp8266/Makefile b/esp8266/Makefile
index 2e92e1c0a..00370a519 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -167,6 +167,7 @@ LIB_SRC_C = $(addprefix lib/,\
libm/asinfacosf.c \
libm/atanf.c \
libm/atan2f.c \
+ mp-readline/builtin_input.c \
mp-readline/readline.c \
netutils/netutils.c \
timeutils/timeutils.c \
diff --git a/py/builtininput.c b/lib/mp-readline/builtin_input.c
index 07e7ba35c..07e7ba35c 100644
--- a/py/builtininput.c
+++ b/lib/mp-readline/builtin_input.c
diff --git a/py/py.mk b/py/py.mk
index 0e2c6c1f3..ec22fbe63 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -188,7 +188,6 @@ PY_O_BASENAME = \
stream.o \
binary.o \
builtinimport.o \
- builtininput.o \
builtinevex.o \
modarray.o \
modbuiltins.o \
diff --git a/stmhal/Makefile b/stmhal/Makefile
index 6073a7690..30ec40f3a 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -108,6 +108,7 @@ SRC_LIB = $(addprefix lib/,\
libm/wf_tgamma.c \
fatfs/ff.c \
fatfs/option/ccsbcs.c \
+ mp-readline/builtin_input.c \
mp-readline/readline.c \
netutils/netutils.c \
timeutils/timeutils.c \
diff --git a/teensy/Makefile b/teensy/Makefile
index a38916ff8..ab377dfb2 100644
--- a/teensy/Makefile
+++ b/teensy/Makefile
@@ -106,6 +106,7 @@ STM_SRC_S = $(addprefix stmhal/,\
LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
+ mp-readline/builtin_input.c \
mp-readline/readline.c \
utils/pyexec.c \
utils/pyhelp.c \