From aaf01481aa5ded82a4706770f235c490649437bf Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 25 May 2017 12:14:42 -0700 Subject: [PATCH] Change the approach for input so that its not included in every single build. Put it next to readline instead. --- atmel-samd/Makefile | 1 + esp8266/Makefile | 1 + py/builtininput.c => lib/mp-readline/builtin_input.c | 0 py/py.mk | 1 - stmhal/Makefile | 1 + teensy/Makefile | 1 + 6 files changed, 4 insertions(+), 1 deletion(-) rename py/builtininput.c => lib/mp-readline/builtin_input.c (100%) diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile index bbfa62a25a..92b1e305bc 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 2e92e1c0a7..00370a519d 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 similarity index 100% rename from py/builtininput.c rename to lib/mp-readline/builtin_input.c diff --git a/py/py.mk b/py/py.mk index 0e2c6c1f3f..ec22fbe63a 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 6073a76909..30ec40f3a4 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 a38916ff86..ab377dfb24 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 \