You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/05/18 21:37:32 UTC
[incubator-nuttx-apps] branch master updated (0a6f978 -> 6a26547)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 0a6f978 app/builtin: simplify the application registraion flow
new d232823 build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig
new 6a26547 build: Move INCDIROPT to common place
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Application.mk | 4 ++--
Make.defs | 12 ++++++------
Makefile | 2 +-
examples/audio_rttl/Makefile | 7 +------
examples/elf/tests/errno/Makefile | 2 +-
examples/elf/tests/hello/Makefile | 2 +-
examples/elf/tests/helloxx/Makefile | 2 +-
examples/elf/tests/longjmp/Makefile | 2 +-
examples/elf/tests/mutex/Makefile | 2 +-
examples/elf/tests/pthread/Makefile | 2 +-
examples/elf/tests/signal/Makefile | 2 +-
examples/elf/tests/struct/Makefile | 2 +-
examples/elf/tests/task/Makefile | 2 +-
examples/lvgldemo/Makefile | 4 ++--
examples/module/drivers/chardev/Makefile | 2 +-
examples/pwfb/Makefile | 2 +-
examples/sotest/lib/modprint/Makefile | 2 +-
examples/sotest/lib/sotest/Makefile | 2 +-
graphics/littlevgl/Makefile | 2 +-
graphics/pdcurs34/Makefile | 2 +-
graphics/pdcurs34/nuttx/Make.defs | 2 +-
graphics/twm4nx/Makefile | 2 +-
import/Make.defs | 6 +++---
interpreters/ficl/Makefile | 2 +-
modbus/ascii/Make.defs | 2 +-
modbus/functions/Make.defs | 2 +-
modbus/nuttx/Make.defs | 2 +-
modbus/rtu/Make.defs | 2 +-
modbus/tcp/Make.defs | 2 +-
netutils/thttpd/cgi-src/Makefile | 2 +-
system/hexed/Makefile | 2 +-
wireless/iwpan/src/Make.defs | 2 +-
wireless/wapi/src/Make.defs | 2 +-
33 files changed, 42 insertions(+), 47 deletions(-)
[incubator-nuttx-apps] 01/02: build: Replace WINTOOL with
CYGWIN_WINTOOL Kconfig
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit d232823e63943440b6d5593e0f196f8f8d9443e4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue May 19 00:08:15 2020 +0800
build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig
so the correct value can be determinated by Kconfig system automatically
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Application.mk | 4 ++--
Make.defs | 6 +++---
Makefile | 2 +-
examples/audio_rttl/Makefile | 7 +------
examples/elf/tests/errno/Makefile | 2 +-
examples/elf/tests/hello/Makefile | 2 +-
examples/elf/tests/helloxx/Makefile | 2 +-
examples/elf/tests/longjmp/Makefile | 2 +-
examples/elf/tests/mutex/Makefile | 2 +-
examples/elf/tests/pthread/Makefile | 2 +-
examples/elf/tests/signal/Makefile | 2 +-
examples/elf/tests/struct/Makefile | 2 +-
examples/elf/tests/task/Makefile | 2 +-
examples/module/drivers/chardev/Makefile | 2 +-
examples/sotest/lib/modprint/Makefile | 2 +-
examples/sotest/lib/sotest/Makefile | 2 +-
import/Make.defs | 6 +++---
17 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/Application.mk b/Application.mk
index e629db4..e56f316 100644
--- a/Application.mk
+++ b/Application.mk
@@ -128,7 +128,7 @@ $(CXXOBJS): %$(SUFFIX)$(OBJEXT): %$(CXXEXT)
$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))
.built: $(OBJS)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(call ARLOCK, "${shell cygpath -w $(BIN)}", $(OBJS))
else
$(call ARLOCK, $(BIN), $(OBJS))
@@ -153,7 +153,7 @@ PROGOBJ := $(MAINOBJ)
$(PROGLIST): $(MAINOBJ)
$(Q) mkdir -p $(BINDIR)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(call ELFLD,$(firstword $(PROGOBJ)),"${shell cygpath -w $(firstword $(PROGLIST))}")
else
$(call ELFLD,$(firstword $(PROGOBJ)),$(firstword $(PROGLIST)))
diff --git a/Make.defs b/Make.defs
index 13d1ad1..b5ba6a6 100644
--- a/Make.defs
+++ b/Make.defs
@@ -116,7 +116,7 @@ else ifeq ($(CONFIG_WINDOWS_MSYS),y)
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
else
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
else
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh
@@ -146,7 +146,7 @@ else
MKKCONFIG = $(APPDIR)$(DELIM)tools$(DELIM)mkkconfig.sh
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
@@ -155,7 +155,7 @@ endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDLIBS ?= "${shell cygpath -w $(BIN)}"
else
LDLIBS ?= $(BIN)
diff --git a/Makefile b/Makefile
index 5b949ab..4cd47d5 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ $(SYMTABOBJ): %$(OBJEXT): %.c
$(call COMPILE, -fno-lto $<, $@)
$(BIN): $(SYMTABOBJ)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(call ARLOCK, "${shell cygpath -w $(BIN)}", $^)
else
$(call ARLOCK, $(BIN), $^)
diff --git a/examples/audio_rttl/Makefile b/examples/audio_rttl/Makefile
index 2192290..e5f0de5 100644
--- a/examples/audio_rttl/Makefile
+++ b/examples/audio_rttl/Makefile
@@ -54,12 +54,7 @@ AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
# Audio Example flags
-ifeq ($(WINTOOL),y)
-CXXFLAGS += -I "${shell cygpath -w $(AUDIODIR)}"
-else
-CXXFLAGS += -I $(AUDIODIR)
-endif
-
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(AUDIODIR)"}
CXXFLAGS += -D_POSIX
include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 8bb6ba3..0141ca7 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index 1766afd..7f71bd2 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index 4f29898..d94b5aa 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index 7521ab8..1c6834c 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index ce4114b..9538259 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index f741250..c161a16 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index d9acd2c..7024151 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 4245d0c..7e1bd5e 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -40,7 +40,7 @@ DELIM ?= /
CELFFLAGS += -I.
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index f95898c..c80f7da 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile
index f1f9c70..6e111ea 100644
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/sotest/lib/modprint/Makefile b/examples/sotest/lib/modprint/Makefile
index f198729..016fefa 100644
--- a/examples/sotest/lib/modprint/Makefile
+++ b/examples/sotest/lib/modprint/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/examples/sotest/lib/sotest/Makefile b/examples/sotest/lib/sotest/Makefile
index 5b36ab1..8ee951b 100644
--- a/examples/sotest/lib/sotest/Makefile
+++ b/examples/sotest/lib/sotest/Makefile
@@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
diff --git a/import/Make.defs b/import/Make.defs
index a484a31..454444c 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -148,7 +148,7 @@ endif
# Tool related definitions
# Compiler
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -181,7 +181,7 @@ AFLAGS = $(CFLAGS) -D__ASSEMBLY__
# Linker
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}"
else
@@ -203,7 +203,7 @@ endif
# ELF module definitions
LDELFFLAGS = -r -e _start -Bstatic
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/scripts/gnu-elf.ld
[incubator-nuttx-apps] 02/02: build: Move INCDIROPT to common place
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 6a26547dec6c74620f701b8e3d66119054909879
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue May 19 03:46:04 2020 +0800
build: Move INCDIROPT to common place
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Make.defs | 6 +++---
examples/audio_rttl/Makefile | 2 +-
examples/lvgldemo/Makefile | 4 ++--
examples/pwfb/Makefile | 2 +-
graphics/littlevgl/Makefile | 2 +-
graphics/pdcurs34/Makefile | 2 +-
graphics/pdcurs34/nuttx/Make.defs | 2 +-
graphics/twm4nx/Makefile | 2 +-
interpreters/ficl/Makefile | 2 +-
modbus/ascii/Make.defs | 2 +-
modbus/functions/Make.defs | 2 +-
modbus/nuttx/Make.defs | 2 +-
modbus/rtu/Make.defs | 2 +-
modbus/tcp/Make.defs | 2 +-
netutils/thttpd/cgi-src/Makefile | 2 +-
system/hexed/Makefile | 2 +-
wireless/iwpan/src/Make.defs | 2 +-
wireless/wapi/src/Make.defs | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Make.defs b/Make.defs
index b5ba6a6..5e4b33a 100644
--- a/Make.defs
+++ b/Make.defs
@@ -147,13 +147,13 @@ else
endif
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
- INCDIROPT = -w
+ INCDIR += -w
endif
# Standard include path
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
+CFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDLIBS ?= "${shell cygpath -w $(BIN)}"
diff --git a/examples/audio_rttl/Makefile b/examples/audio_rttl/Makefile
index e5f0de5..580d651 100644
--- a/examples/audio_rttl/Makefile
+++ b/examples/audio_rttl/Makefile
@@ -54,7 +54,7 @@ AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
# Audio Example flags
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(AUDIODIR)"}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(AUDIODIR)"}
CXXFLAGS += -D_POSIX
include $(APPDIR)/Application.mk
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index 2cf5f2b..9de1164 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -59,7 +59,7 @@ endif
MAINSRC = lvgldemo.c
LVGLDIR=$(APPDIR)/graphics/littlevgl/lvgl
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(LVGLDIR)"}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(LVGLDIR)"}
+CFLAGS += ${shell $(INCDIR) "$(CC)" "$(LVGLDIR)"}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(LVGLDIR)"}
include $(APPDIR)/Application.mk
diff --git a/examples/pwfb/Makefile b/examples/pwfb/Makefile
index dc741dc..590fe4d 100644
--- a/examples/pwfb/Makefile
+++ b/examples/pwfb/Makefile
@@ -38,7 +38,7 @@
# NuttX per-window frame buffer graphics example.
NXGLYPHS = $(APPDIR)$(DELIM)graphics$(DELIM)nxglyphs
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(NXGLYPHS)$(DELIM)include"}
+CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXGLYPHS)$(DELIM)include"}
CSRCS = pwfb_events.c pwfb_motion.c
MAINSRC = pwfb_main.c
diff --git a/graphics/littlevgl/Makefile b/graphics/littlevgl/Makefile
index fbb6d39..d179a58 100644
--- a/graphics/littlevgl/Makefile
+++ b/graphics/littlevgl/Makefile
@@ -67,7 +67,7 @@ PATCH ?= patch -p0
LVGL_UNPACKDIR = $(WD)/$(LVGL_UNPACKNAME)
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/littlevgl}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/littlevgl}
$(LVGL_TARBALL):
@echo "Downloading: $(LVGL_TARBALL)"
diff --git a/graphics/pdcurs34/Makefile b/graphics/pdcurs34/Makefile
index 2f8bdc8..6290841 100644
--- a/graphics/pdcurs34/Makefile
+++ b/graphics/pdcurs34/Makefile
@@ -39,6 +39,6 @@
include pdcurses/Make.defs
include nuttx/Make.defs
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/pdcurs34/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/pdcurs34/include}
include $(APPDIR)/Application.mk
diff --git a/graphics/pdcurs34/nuttx/Make.defs b/graphics/pdcurs34/nuttx/Make.defs
index aa6635e..fbe102d 100644
--- a/graphics/pdcurs34/nuttx/Make.defs
+++ b/graphics/pdcurs34/nuttx/Make.defs
@@ -42,4 +42,4 @@ endif
DEPPATH += --dep-path nuttx
VPATH += :nuttx
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/pdcurs34/nuttx}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/pdcurs34/nuttx}
diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile
index dac0b70..efcf268 100644
--- a/graphics/twm4nx/Makefile
+++ b/graphics/twm4nx/Makefile
@@ -37,7 +37,7 @@
# Add path to cursor images to CXXFLAGS
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/graphics/nxglyphs/include"}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)/graphics/nxglyphs/include"}
# Twm4Nx built-in application info
diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
index caed641..3099d49 100644
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@@ -41,7 +41,7 @@ BUILDDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
# Include paths
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src}
# Source Files
diff --git a/modbus/ascii/Make.defs b/modbus/ascii/Make.defs
index d4cb38f..a96ec00 100644
--- a/modbus/ascii/Make.defs
+++ b/modbus/ascii/Make.defs
@@ -39,6 +39,6 @@ CSRCS += mbascii.c
DEPPATH += --dep-path ascii
VPATH += :ascii
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/ascii}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/ascii}
endif
diff --git a/modbus/functions/Make.defs b/modbus/functions/Make.defs
index 1e40d45..71e9e77 100644
--- a/modbus/functions/Make.defs
+++ b/modbus/functions/Make.defs
@@ -46,4 +46,4 @@ endif
DEPPATH += --dep-path functions
VPATH += :functions
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/functions}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/functions}
diff --git a/modbus/nuttx/Make.defs b/modbus/nuttx/Make.defs
index a748561..d40ae13 100644
--- a/modbus/nuttx/Make.defs
+++ b/modbus/nuttx/Make.defs
@@ -45,4 +45,4 @@ endif
DEPPATH += --dep-path nuttx
VPATH += :nuttx
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/nuttx}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/nuttx}
diff --git a/modbus/rtu/Make.defs b/modbus/rtu/Make.defs
index 40db969..b17aa4f 100644
--- a/modbus/rtu/Make.defs
+++ b/modbus/rtu/Make.defs
@@ -55,6 +55,6 @@ endif
DEPPATH += --dep-path rtu
VPATH += :rtu
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/rtu}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/rtu}
endif
diff --git a/modbus/tcp/Make.defs b/modbus/tcp/Make.defs
index 4cd2adb..f07d115 100644
--- a/modbus/tcp/Make.defs
+++ b/modbus/tcp/Make.defs
@@ -39,6 +39,6 @@ CSRCS += mbtcp.c
DEPPATH += --dep-path tcp
VPATH += :tcp
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/tcp}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/tcp}
endif
diff --git a/netutils/thttpd/cgi-src/Makefile b/netutils/thttpd/cgi-src/Makefile
index 7ad1ab9..5a785cf 100644
--- a/netutils/thttpd/cgi-src/Makefile
+++ b/netutils/thttpd/cgi-src/Makefile
@@ -35,7 +35,7 @@
-include $(TOPDIR)/Make.defs
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/netutils/thttpd" "$(APPDIR)/netutils/thttpd/cgi-src"}
+CFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)/netutils/thttpd" "$(APPDIR)/netutils/thttpd/cgi-src"}
CGIBINDIR = $(APPDIR)/netutils/thttpd/cgi-bin
CLEANFILES = *.o redirect ssi phf
diff --git a/system/hexed/Makefile b/system/hexed/Makefile
index e1aed51..2df0f7d 100644
--- a/system/hexed/Makefile
+++ b/system/hexed/Makefile
@@ -46,7 +46,7 @@ CSRCS = bfile.c cmdargs.c hexcopy.c hexdump.c hexenter.c hexhelp.c
CSRCS += hexinsert.c hexmove.c hexremove.c hexword.c
MAINSRC = hexed.c
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" include}
+CFLAGS += ${shell $(INCDIR) "$(CC)" include}
VPATH += :src
ROOTDEPPATH += --dep-path src
diff --git a/wireless/iwpan/src/Make.defs b/wireless/iwpan/src/Make.defs
index 2a9f60c..707180d 100644
--- a/wireless/iwpan/src/Make.defs
+++ b/wireless/iwpan/src/Make.defs
@@ -40,6 +40,6 @@ MAINSRC = iwpan.c
DEPPATH += --dep-path src
VPATH += :src
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/wireless/iwpan/src}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/wireless/iwpan/src}
endif
diff --git a/wireless/wapi/src/Make.defs b/wireless/wapi/src/Make.defs
index 769cb86..ea09f8c 100644
--- a/wireless/wapi/src/Make.defs
+++ b/wireless/wapi/src/Make.defs
@@ -43,6 +43,6 @@ endif
DEPPATH += --dep-path src
VPATH += :src
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/wireless/wapi/src}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/wireless/wapi/src}
endif