all: Make netutils.h available to all ports by default.

Generally, ports should inherit INC from py.mk, append to it, not overwrite it. TODO: Likely should do the same for other vars too.
7 years ago · e0f5df579b
parent 8ee153f234
commit e0f5df579b
10 changed files with 11 additions and 9 deletions
--- a/bare-arm/Makefile
+++ b/bare-arm/Makefile
@ -8,7 +8,7 @@ include ../py/py.mk

 CROSS_COMPILE = arm-none-eabi-

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I$(BUILD)

--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@ -14,7 +14,7 @@ BAUD = 115200
 CROSS_COMPILE = xtensa-lx106-elf-
 ESP_SDK = $(shell $(CC) -print-sysroot)/usr

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I../stmhal
 INC += -I../lib/mp-readline
--- a/minimal/Makefile
+++ b/minimal/Makefile
@ -12,7 +12,7 @@ ifeq ($(CROSS), 1)
 CROSS_COMPILE = arm-none-eabi-
 endif

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I../lib/mp-readline
 INC += -I../stmhal
--- a/pic16bit/Makefile
+++ b/pic16bit/Makefile
@ -12,7 +12,7 @@ CROSS_COMPILE = $(XC16)/bin/xc16-
 PARTFAMILY = dsPIC33F
 PART = 33FJ256GP506

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I../lib/mp-readline
 INC += -I../stmhal
--- a/py/py.mk
+++ b/py/py.mk
@ -10,6 +10,8 @@ PY_QSTR_DEFS = $(PY_SRC)/qstrdefs.h
 # some code is performance bottleneck and compiled with other optimization options
 CSUPEROPT = -O3

+INC += -I../lib/netutils
+
 ifeq ($(MICROPY_PY_USSL),1)
 CFLAGS_MOD += -DMICROPY_PY_USSL=1 -I../lib/axtls/ssl -I../lib/axtls/crypto -I../lib/axtls/config
 LDFLAGS_MOD += -L../lib/axtls/_stage -laxtls
--- a/qemu-arm/Makefile
+++ b/qemu-arm/Makefile
@ -9,7 +9,7 @@ include ../py/py.mk

 CROSS_COMPILE = arm-none-eabi-

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I$(BUILD)
 INC += -I../tools/tinytest/
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@ -32,7 +32,7 @@ DEVICE=0483:df11

 CROSS_COMPILE = arm-none-eabi-

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I$(BUILD)
 INC += -I$(CMSIS_DIR)/inc
--- a/teensy/Makefile
+++ b/teensy/Makefile
@ -29,7 +29,7 @@ endif
 CFLAGS_TEENSY = -DF_CPU=96000000 -DUSB_SERIAL -D__MK20DX256__
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -mfloat-abi=soft -fsingle-precision-constant -Wdouble-promotion $(CFLAGS_TEENSY)

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I../stmhal
 INC += -I../lib/mp-readline
--- a/unix/Makefile
+++ b/unix/Makefile
@ -13,7 +13,7 @@ UNAME_S := $(shell uname -s)
 # include py core make definitions
 include ../py/py.mk

-INC =  -I.
+INC +=  -I.
 INC +=  -I..
 INC += -I$(BUILD)

--- a/windows/Makefile
+++ b/windows/Makefile
@ -10,7 +10,7 @@ QSTR_DEFS = ../unix/qstrdefsport.h
 # include py core make definitions
 include ../py/py.mk

-INC =  -I.
+INC += -I.
 INC += -I..
 INC += -I$(BUILD)