build: Replace $(TOPDIR)/Make.defs with $(APPDIR)/Make.defs

and move NUTTXLIB defintion to the common place Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2020-05-20 12:35:03 +08:00 · 2020-05-20 12:35:03 +08:00 · deaa6c5b7b
commit deaa6c5b7b
parent 6daab509ca
316 changed files with 332 additions and 401 deletions
--- a/Application.mk
+++ b/Application.mk
@ -35,8 +35,6 @@
 #
 ############################################################################

-include $(APPDIR)/Make.defs
-
 # If this is an executable program (with MAINSRC), we must build it as a
 # loadable module for the KERNEL build (always) or if the tristate module
 # has the value "m"
@ -61,6 +59,12 @@ else
 CWD = $(CURDIR)
 endif

+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
+  LDLIBS += "${shell cygpath -w $(BIN)}"
+else
+  LDLIBS += $(BIN)
+endif
+
 SUFFIX = $(subst $(DELIM),.,$(CWD))
 PROGNAME := $(shell echo $(PROGNAME))

--- a/Directory.mk
+++ b/Directory.mk
@ -33,7 +33,6 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs

 # Sub-directories
--- a/Make.defs
+++ b/Make.defs
@ -34,6 +34,19 @@
 #
 ############################################################################

+TOPDIR ?= $(APPDIR)/import
+include $(TOPDIR)/Make.defs
+
+# The GNU make CURDIR will always be a POSIX-like path with forward slashes
+# as path segment separators.  This is fine for the above inclusions but
+# will cause problems later for the native build.  If we know that this is
+# a native build, then we need to fix up the APPDIR path for subsequent
+# use
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+APPDIR := ${shell echo %CD%}
+endif
+
 # Application Directories

 # BUILDIRS is the list of top-level directories containing Make.defs files
@ -103,7 +116,7 @@ CFLAGS   += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
 CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}

 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  LDLIBS ?= "${shell cygpath -w $(BIN)}"
+  NUTTXLIB ?= "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-  LDLIBS ?= $(BIN)
+  NUTTXLIB ?= "$(TOPDIR)$(DELIM)staging"
 endif
--- a/12
+++ b/12
@ -36,20 +36,8 @@
 ############################################################################

 APPDIR = $(CURDIR)
-TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs

-# The GNU make CURDIR will always be a POSIX-like path with forward slashes
-# as path segment separators.  This is fine for the above inclusions but
-# will cause problems later for the native build.  If we know that this is
-# a native build, then we need to fix up the APPDIR path for subsequent
-# use
-
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-APPDIR := ${shell echo %CD%}
-endif
-
 # Symbol table for loadable apps.

 SYMTABSRC = symtab_apps.c
--- a/builtin/Makefile
+++ b/builtin/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Source and object files

--- a/canutils/candump/Makefile
+++ b/canutils/candump/Makefile
@ -18,7 +18,7 @@
 #
 ############################################################################/

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # SocketCAN userspace utilities and tools candump tool
 # https://github.com/linux-can/can-utils/blob/master/candump.c
--- a/canutils/canlib/Makefile
+++ b/canutils/canlib/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # CAN utility library

--- a/canutils/cansend/Makefile
+++ b/canutils/cansend/Makefile
@ -18,7 +18,7 @@
 #
 ############################################################################/

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # SocketCAN userspace utilities and tools cansend tool
 # https://github.com/linux-can/can-utils/blob/master/cansend.c
--- a/canutils/libcanard/Makefile
+++ b/canutils/libcanard/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 WGET = wget
 UNPACK = unzip
--- a/canutils/libcanutils/Makefile
+++ b/canutils/libcanutils/Makefile
@ -18,7 +18,7 @@
 #
 ############################################################################/

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # SocketCAN userspace utilities and tools library
 # https://github.com/linux-can/can-utils
--- a/canutils/libobd2/Makefile
+++ b/canutils/libobd2/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # CAN utility library

--- a/examples/abntcodi/Makefile
+++ b/examples/abntcodi/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # ABNTCODI built-in application info

--- a/examples/adc/Makefile
+++ b/examples/adc/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # ADC example

--- a/examples/adxl372_test/Makefile
+++ b/examples/adxl372_test/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 PROGNAME = $(CONFIG_EXAMPLES_ADXL372_TEST_PROGNAME)
 PRIORITY = $(CONFIG_EXAMPLES_ADXL372_TEST_PRIORITY)
--- a/examples/ajoystick/Makefile
+++ b/examples/ajoystick/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! Example

--- a/examples/alarm/Makefile
+++ b/examples/alarm/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # RTC driver alarm test built-in application info

--- a/examples/apa102/Makefile
+++ b/examples/apa102/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # APA102 built-in application info

--- a/examples/apds9960/Makefile
+++ b/examples/apds9960/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! built-in application info

--- a/examples/audio_rttl/Makefile
+++ b/examples/audio_rttl/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs

 # Audio application info
--- a/examples/bastest/Makefile
+++ b/examples/bastest/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # BAS test volume mounter

--- a/examples/battery/Makefile
+++ b/examples/battery/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Battery built-in application info

--- a/examples/bmi160/Makefile
+++ b/examples/bmi160/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs

 # sixaxis built-in application info
--- a/examples/bmp180/Makefile
+++ b/examples/bmp180/Makefile
@ -35,7 +35,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # BMP180 Barometer sensor example built-in application info

--- a/examples/bridge/Makefile
+++ b/examples/bridge/Makefile
@ -34,7 +34,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Discover built-in application info

--- a/examples/buttons/Makefile
+++ b/examples/buttons/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # LED driver test built-in application info

--- a/examples/calib_udelay/Makefile
+++ b/examples/calib_udelay/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # built-in application info

--- a/examples/camera/Makefile
+++ b/examples/camera/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # camera built-in application info

--- a/examples/can/Makefile
+++ b/examples/can/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # NuttX NX Graphics Example.

--- a/examples/canard/Makefile
+++ b/examples/canard/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 PROGNAME = canard
 PRIORITY = SCHED_PRIORITY_DEFAULT
--- a/examples/cctype/Makefile
+++ b/examples/cctype/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # cctype verification

--- a/examples/charger/Makefile
+++ b/examples/charger/Makefile
@ -1,5 +1,5 @@

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs

 PROGNAME = $(CONFIG_EXAMPLES_CHARGER_PROGNAME)
--- a/examples/chat/Makefile
+++ b/examples/chat/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 MAINSRC = chat_main.c

--- a/examples/chrono/Makefile
+++ b/examples/chrono/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Chronometer built-in application info

--- a/examples/configdata/Makefile
+++ b/examples/configdata/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # CONFIGDATA Unit Test

--- a/examples/cpuhog/Makefile
+++ b/examples/cpuhog/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # do nothing loop to use up cpu time

--- a/examples/cromfs/Makefile
+++ b/examples/cromfs/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # CROMFS Example

--- a/examples/dac/Makefile
+++ b/examples/dac/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # DAC tool

--- a/examples/dhcpd/Makefile
+++ b/examples/dhcpd/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # DHCP Daemon Example

--- a/examples/dhcpd/Makefile.host
+++ b/examples/dhcpd/Makefile.host
@ -35,7 +35,7 @@

 # TOPDIR must be defined on the make command line

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 OBJS		= host.hobj dhcpd.hobj
 BIN		= dhcpd
--- a/examples/dhtxx/Makefile
+++ b/examples/dhtxx/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Dhtxx, World! built-in application info

--- a/examples/discover/Makefile
+++ b/examples/discover/Makefile
@ -36,7 +36,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Discover built-in application info

--- a/examples/djoystick/Makefile
+++ b/examples/djoystick/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! Example

--- a/examples/dsptest/Makefile
+++ b/examples/dsptest/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # dsptest built-in application info

--- a/examples/elf/Makefile
+++ b/examples/elf/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # ELF Example

--- a/examples/elf/tests/Makefile
+++ b/examples/elf/tests/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 ALL_SUBDIRS = errno hello helloxx longjmp mutex pthread signal task struct
 BUILD_SUBDIRS = errno hello struct signal
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
 LDELFFLAGS += -Bstatic
--- a/examples/embedlog/Makefile
+++ b/examples/embedlog/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # embedlog example built-in application info

--- a/examples/fb/Makefile
+++ b/examples/fb/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # FB, World! built-in application info

--- a/examples/fboverlay/Makefile
+++ b/examples/fboverlay/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # fboverlay built-in application info

--- a/examples/flash_test/Makefile
+++ b/examples/flash_test/Makefile
@ -34,7 +34,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # SMART FLASH block device test

--- a/examples/flowc/Makefile
+++ b/examples/flowc/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # FLOWC Test

--- a/examples/ft80x/Makefile
+++ b/examples/ft80x/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # FT80X example built-in application info

--- a/examples/ftpc/Makefile
+++ b/examples/ftpc/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # FTPC Client Application

--- a/examples/ftpd/Makefile
+++ b/examples/ftpd/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 MAINSRC = ftpd_main.c

--- a/examples/gpio/Makefile
+++ b/examples/gpio/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # GPIO, World! built-in application info

--- a/examples/gps/Makefile
+++ b/examples/gps/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # GPS built-in application info

--- a/examples/hdc1008_demo/Makefile
+++ b/examples/hdc1008_demo/Makefile
@ -18,7 +18,7 @@
 #
 ############################################################################/

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # hdc1008 example built-in application info

--- a/examples/hello/Makefile
+++ b/examples/hello/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! built-in application info

--- a/examples/helloxx/Makefile
+++ b/examples/helloxx/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! C++ Example

--- a/examples/hidkbd/Makefile
+++ b/examples/hidkbd/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # USB Host HID keyboard Example

--- a/examples/hts221_reader/Makefile
+++ b/examples/hts221_reader/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # hts221_reader example

--- a/examples/i2schar/Makefile
+++ b/examples/i2schar/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # I2S character driver test

--- a/examples/i2sloop/Makefile
+++ b/examples/i2sloop/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # I2S character driver test

--- a/examples/igmp/Makefile
+++ b/examples/igmp/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 PROGNAME = igmp
 PRIORITY = SCHED_PRIORITY_DEFAULT
--- a/examples/ina219/Makefile
+++ b/examples/ina219/Makefile
@ -35,7 +35,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! built-in application info

--- a/examples/ina226/Makefile
+++ b/examples/ina226/Makefile
@ -35,7 +35,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # INA226 built-in application info

--- a/examples/ini_dumper/Makefile
+++ b/examples/ini_dumper/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # ini_dumper example built-in application info

--- a/examples/ipforward/Makefile
+++ b/examples/ipforward/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Hello, World! built-in application info

--- a/examples/json/Makefile
+++ b/examples/json/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # cJSON built-in application info

--- a/examples/leds/Makefile
+++ b/examples/leds/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # LED driver test built-in application info

--- a/examples/lis3dsh_reader/Makefile
+++ b/examples/lis3dsh_reader/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 PROGNAME = $(CONFIG_EXAMPLES_LIS3DSH_READER_PROGNAME)
 PRIORITY = SCHED_PRIORITY_DEFAULT
--- a/examples/lsm303_reader/Makefile
+++ b/examples/lsm303_reader/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # lsm303_reader example

--- a/examples/lsm330spi_test/Makefile
+++ b/examples/lsm330spi_test/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 PROGNAME = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PROGNAME)
 PRIORITY = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PRIORITY)
--- a/examples/lsm6dsl_reader/Makefile
+++ b/examples/lsm6dsl_reader/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # lsm6dsl_reader example

--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # LittleVGL demo built-in application info

--- a/examples/max31855/Makefile
+++ b/examples/max31855/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # max31855 built-in application info

--- a/examples/media/Makefile
+++ b/examples/media/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Media test application info

--- a/examples/mld/Makefile
+++ b/examples/mld/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # MLD Networking Example

--- a/examples/mlx90614/Makefile
+++ b/examples/mlx90614/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # MLX90614 built-in application info

--- a/examples/modbus/Makefile
+++ b/examples/modbus/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # FreeModBus demo built-in application info

--- a/examples/modbusmaster/Makefile
+++ b/examples/modbusmaster/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Modbus Master built-in application info

--- a/examples/module/Makefile
+++ b/examples/module/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Module example built-in application info

--- a/examples/module/drivers/Makefile
+++ b/examples/module/drivers/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 ALL_SUBDIRS = chardev
 BUILD_SUBDIRS = chardev
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@ -33,13 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
-
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
-endif
+include $(APPDIR)/Make.defs

 CMODULEFLAGS += $(KDEFINE)

--- a/examples/mount/Makefile
+++ b/examples/mount/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # mount() test

--- a/examples/mtdpart/Makefile
+++ b/examples/mtdpart/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # MTD Partition Example

--- a/examples/mtdrwb/Makefile
+++ b/examples/mtdrwb/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # MTD R/W buffer test Example

--- a/examples/netlink_route/Makefile
+++ b/examples/netlink_route/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Netlink NETLINK_ROUTE built-in application info

--- a/examples/netloop/Makefile
+++ b/examples/netloop/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Network loopback Example

--- a/examples/netpkt/Makefile
+++ b/examples/netpkt/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Network packet socket example

--- a/examples/nettest/Makefile
+++ b/examples/nettest/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Basic TCP networking test

--- a/examples/nrf24l01_term/Makefile
+++ b/examples/nrf24l01_term/Makefile
@ -33,7 +33,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs

 # Basic nRF24L01+ terminal demonstration

--- a/Show More
+++ b/Show More