From c2e22d66da3d0e18eace43e2705ee47e99431ae2 Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 1 Jan 2015 21:14:42 +0000 Subject: [PATCH] bare-arm: Prefix includes with py/; remove need for -I../py. --- bare-arm/Makefile | 1 - bare-arm/main.c | 20 +++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/bare-arm/Makefile b/bare-arm/Makefile index 2809b18932..a59bb9f89a 100644 --- a/bare-arm/Makefile +++ b/bare-arm/Makefile @@ -10,7 +10,6 @@ CROSS_COMPILE = arm-none-eabi- INC = -I. INC += -I.. -INC += -I$(PY_SRC) INC += -I$(BUILD) CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion diff --git a/bare-arm/main.c b/bare-arm/main.c index d9f83b4ebe..8ee4447e87 100644 --- a/bare-arm/main.c +++ b/bare-arm/main.c @@ -2,19 +2,13 @@ #include #include -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "lexer.h" -#include "parse.h" -#include "obj.h" -#include "parsehelper.h" -#include "compile.h" -#include "runtime0.h" -#include "runtime.h" -#include "repl.h" -#include "pfenv.h" +#include "py/nlr.h" +#include "py/parsehelper.h" +#include "py/compile.h" +#include "py/runtime0.h" +#include "py/runtime.h" +#include "py/repl.h" +#include "py/pfenv.h" void do_str(const char *src) { mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);