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:34 UTC
[incubator-nuttx-apps] 02/02: build: Move INCDIROPT to common place
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