diff --git a/Makefile b/Makefile index acbf290b9..afc97da25 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ APPDIR = $(CURDIR) TOPDIR ?= $(APPDIR)/import --include $(TOPDIR)/Make.defs --include $(APPDIR)/Make.defs +include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs # Application Directories diff --git a/builtin/Makefile b/builtin/Makefile index 15b99dbe0..2acc9f7c9 100644 --- a/builtin/Makefile +++ b/builtin/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Source and object files diff --git a/builtin/registry/Makefile b/builtin/registry/Makefile index 255e55206..d5a4ab28c 100644 --- a/builtin/registry/Makefile +++ b/builtin/registry/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs # NSH Library diff --git a/canutils/canlib/Makefile b/canutils/canlib/Makefile index 892ed27e0..dd70839ee 100644 --- a/canutils/canlib/Makefile +++ b/canutils/canlib/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CAN utility library -ASRCS = CSRCS = canlib_getbaud.c canlib_setbaud.c CSRCS += canlib_getloopback.c canlib_setloopback.c CSRCS += canlib_getsilent.c canlib_setsilent.c diff --git a/canutils/libcanard/Makefile b/canutils/libcanard/Makefile index 1b1579ed2..40ab4036c 100644 --- a/canutils/libcanard/Makefile +++ b/canutils/libcanard/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs WGET = wget UNPACK = unzip diff --git a/canutils/libobd2/Makefile b/canutils/libobd2/Makefile index d2225e6c1..129e99ee3 100644 --- a/canutils/libobd2/Makefile +++ b/canutils/libobd2/Makefile @@ -33,12 +33,11 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CAN utility library -ASRCS = -CSRCS = obd2.c obd_sendrequest.c obd_waitresponse.c obd_decodepid.c +CSRCS = obd2.c obd_sendrequest.c obd_waitresponse.c obd_decodepid.c APPNAME = libobd2 diff --git a/examples/abntcodi/Makefile b/examples/abntcodi/Makefile index 6a3fda376..0ec8955fc 100644 --- a/examples/abntcodi/Makefile +++ b/examples/abntcodi/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ABNTCODI built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_ABNTCODI_STACKSIZE) # ABNTCODI Example -ASRCS = -CSRCS = MAINSRC = abntcodi_main.c CONFIG_EXAMPLES_ABNTCODI_PROGNAME ?= abntcodi$(EXEEXT) diff --git a/examples/adc/Makefile b/examples/adc/Makefile index 564859391..b9eeaf328 100644 --- a/examples/adc/Makefile +++ b/examples/adc/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ADC example -ASRCS = -CSRCS = MAINSRC = adc_main.c CONFIG_XYZ_PROGNAME ?= adc$(EXEEXT) diff --git a/examples/adxl372_test/Makefile b/examples/adxl372_test/Makefile index 591019df2..76bd0f2ec 100644 --- a/examples/adxl372_test/Makefile +++ b/examples/adxl372_test/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_EXAMPLES_ADXL372_TEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT CONFIG_EXAMPLES_ADXL372_TEST_STACKSIZE ?= 2048 @@ -44,8 +44,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_ADXL372_TEST_STACKSIZE) # ADXL372 sensor test Example -ASRCS = -CSRCS = MAINSRC = adxl372_test_main.c CONFIG_EXAMPLES_ADXL372_TEST_PROGNAME ?= adxl372_test$(EXEEXT) diff --git a/examples/ajoystick/Makefile b/examples/ajoystick/Makefile index ee8ad0c9d..20f561fac 100644 --- a/examples/ajoystick/Makefile +++ b/examples/ajoystick/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = ajoy_main.c CONFIG_AJOY_PROGNAME ?= ajoy$(EXEEXT) diff --git a/examples/alarm/Makefile b/examples/alarm/Makefile index a5907a5e4..6b88ab254 100644 --- a/examples/alarm/Makefile +++ b/examples/alarm/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # RTC driver alarm test built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_ALARM_STACKSIZE) # RTC driver alarm test -ASRCS = -CSRCS = MAINSRC = alarm_main.c CONFIG_EXAMPLES_ALARM_PROGNAME ?= alarm$(EXEEXT) diff --git a/examples/apa102/Makefile b/examples/apa102/Makefile index 7f883a29c..435ad1222 100644 --- a/examples/apa102/Makefile +++ b/examples/apa102/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # APA102 built-in application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # APA102 Test -ASRCS = -CSRCS = MAINSRC = apa102_main.c CONFIG_EXAMPLES_APA102_PROGNAME ?= apa102$(EXEEXT) diff --git a/examples/apds9960/Makefile b/examples/apds9960/Makefile index 283b7404a..2783a7197 100644 --- a/examples/apds9960/Makefile +++ b/examples/apds9960/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_APDS9960_STACKSIZE) # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = apds9960_main.c CONFIG_EXAMPLES_APDS9960_PROGNAME ?= apds9960$(EXEEXT) diff --git a/examples/bastest/Makefile b/examples/bastest/Makefile index 7611e6bb2..9c076e0fa 100644 --- a/examples/bastest/Makefile +++ b/examples/bastest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # BAS test volume mounter diff --git a/examples/battery/Makefile b/examples/battery/Makefile index 2ce184aad..8ddfea4d6 100644 --- a/examples/battery/Makefile +++ b/examples/battery/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Battery built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_BATTERY_STACKSIZE) # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = batt_main.c CONFIG_EXAMPLES_BATTERY_PROGNAME ?= batt$(EXEEXT) diff --git a/examples/bmp180/Makefile b/examples/bmp180/Makefile index 67ea6f357..cb8cf57d1 100644 --- a/examples/bmp180/Makefile +++ b/examples/bmp180/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # BMP180 Barometer sensor example built-in application info @@ -48,8 +48,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_BMP180_STACKSIZE) # BMP180 Barometer sensor example -ASRCS = -CSRCS = MAINSRC = bmp180_main.c CONFIG_EXAMPLES_BMP180_PROGNAME ?= bmp180$(EXEEXT) diff --git a/examples/bridge/Makefile b/examples/bridge/Makefile index 33cafe769..f45c691cf 100644 --- a/examples/bridge/Makefile +++ b/examples/bridge/Makefile @@ -34,7 +34,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Discover built-in application info diff --git a/examples/buttons/Makefile b/examples/buttons/Makefile index 07e4fab5b..9510dbc06 100644 --- a/examples/buttons/Makefile +++ b/examples/buttons/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LED driver test built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_BUTTONS_STACKSIZE) # LED driver test -ASRCS = -CSRCS = MAINSRC = buttons_main.c CONFIG_EXAMPLES_BUTTONS_PROGNAME ?= buttons$(EXEEXT) diff --git a/examples/calib_udelay/Makefile b/examples/calib_udelay/Makefile index 1359c04ff..527adc692 100644 --- a/examples/calib_udelay/Makefile +++ b/examples/calib_udelay/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # built-in application info @@ -49,8 +49,6 @@ PROGNAME = $(CONFIG_EXAMPLES_CALIB_UDELAY_PROGNAME) # Udelay calibration tool -ASRCS = -CSRCS = MAINSRC = calib_udelay_main.c MODULE = CONFIG_EXAMPLES_CALIB_UDELAY diff --git a/examples/can/Makefile b/examples/can/Makefile index 9cc48dfae..19f7e30d8 100644 --- a/examples/can/Makefile +++ b/examples/can/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = -CSRCS = MAINSRC = can_main.c CONFIG_XYZ_PROGNAME ?= can$(EXEEXT) diff --git a/examples/canard/Makefile b/examples/canard/Makefile index 6296bf7d9..9bb8c8b83 100644 --- a/examples/canard/Makefile +++ b/examples/canard/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_EXAMPLES_LIBCANARD_STACKSIZE ?= 2048 @@ -44,8 +44,6 @@ APPNAME = canard PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = $(CONFIG_EXAMPLES_LIBCANARD_STACKSIZE) -ASRCS = -CSRCS = CFLAGS += -I$(APPDIR)/include/canutils MAINSRC = canard_main.c diff --git a/examples/cctype/Makefile b/examples/cctype/Makefile index da103cfd0..a872d8493 100644 --- a/examples/cctype/Makefile +++ b/examples/cctype/Makefile @@ -33,13 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # cctype verification -ASRCS = -CSRCS = -CXXSRCS = MAINSRC = cctype_main.cxx CONFIG_EXAMPLES_CCTYPE_PROGNAME ?= cctype$(EXEEXT) diff --git a/examples/chat/Makefile b/examples/chat/Makefile index 342aa6937..8eb28f6e1 100644 --- a/examples/chat/Makefile +++ b/examples/chat/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs MAINSRC = chat_main.c diff --git a/examples/chrono/Makefile b/examples/chrono/Makefile index c2106f44b..c7e8e491e 100644 --- a/examples/chrono/Makefile +++ b/examples/chrono/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Chronometer built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_CHRONO_STACKSIZE) # Chronometer Example -ASRCS = -CSRCS = MAINSRC = chrono_main.c CONFIG_EXAMPLES_CHRONO_PROGNAME ?= chrono$(EXEEXT) diff --git a/examples/configdata/Makefile b/examples/configdata/Makefile index a0b85db36..7f8b1800e 100644 --- a/examples/configdata/Makefile +++ b/examples/configdata/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CONFIGDATA Unit Test @@ -41,8 +41,6 @@ APPNAME = configdata PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = -CSRCS = MAINSRC = configdata_main.c CONFIG_XYZ_PROGNAME ?= configdata$(EXEEXT) diff --git a/examples/cpuhog/Makefile b/examples/cpuhog/Makefile index 551a91e2b..a1a4a2003 100644 --- a/examples/cpuhog/Makefile +++ b/examples/cpuhog/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # do nothing loop to use up cpu time -ASRCS = -CSRCS = MAINSRC = cpuhog_main.c CONFIG_XYZ_PROGNAME ?= cpuhog$(EXEEXT) diff --git a/examples/cromfs/Makefile b/examples/cromfs/Makefile index e4db1c26e..88efa09f0 100644 --- a/examples/cromfs/Makefile +++ b/examples/cromfs/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CROMFS Example diff --git a/examples/dac/Makefile b/examples/dac/Makefile index 8553fdb72..719135d58 100644 --- a/examples/dac/Makefile +++ b/examples/dac/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # DAC tool -ASRCS = -CSRCS = MAINSRC = dac_main.c CONFIG_XYZ_PROGNAME ?= dac$(EXEEXT) diff --git a/examples/dac/dac_main.c b/examples/dac/dac_main.c index e2e17476d..c4228b98d 100644 --- a/examples/dac/dac_main.c +++ b/examples/dac/dac_main.c @@ -66,8 +66,6 @@ # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif -#define PROGNAME "dac" - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/examples/dhcpd/Makefile b/examples/dhcpd/Makefile index 377395e7b..2368f7b8d 100644 --- a/examples/dhcpd/Makefile +++ b/examples/dhcpd/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # DHCP Daemon Example -ASRCS = -CSRCS = MAINSRC = target.c CONFIG_XYZ_PROGNAME ?= dhcpd$(EXEEXT) diff --git a/examples/dhtxx/Makefile b/examples/dhtxx/Makefile index ff9d42b45..a8251c7bc 100644 --- a/examples/dhtxx/Makefile +++ b/examples/dhtxx/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Dhtxx, World! built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_DHTXX_STACKSIZE) # Dhtxx Example -ASRCS = -CSRCS = MAINSRC = dhtxx_main.c CONFIG_EXAMPLES_DHTXX_PROGNAME ?= dhtxx$(EXEEXT) diff --git a/examples/discover/Makefile b/examples/discover/Makefile index edd76f55e..6af032219 100644 --- a/examples/discover/Makefile +++ b/examples/discover/Makefile @@ -36,7 +36,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Discover built-in application info @@ -44,8 +44,6 @@ APPNAME = discover PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = -CSRCS = MAINSRC = discover_main.c CONFIG_XYZ_PROGNAME ?= discover$(EXEEXT) diff --git a/examples/djoystick/Makefile b/examples/djoystick/Makefile index 8fbedaf95..caf160399 100644 --- a/examples/djoystick/Makefile +++ b/examples/djoystick/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = djoy_main.c CONFIG_DJOY_PROGNAME ?= djoy$(EXEEXT) diff --git a/examples/dsptest/Makefile b/examples/dsptest/Makefile index 478f54574..60546f81d 100644 --- a/examples/dsptest/Makefile +++ b/examples/dsptest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # dsptest built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_DSPTEST_STACKSIZE) # dsptest example -ASRCS = -CSRCS = MAINSRC = dsptest_main.c CSRCS += test_foc.c test_pid.c test_svm.c test_misc.c test_motor.c diff --git a/examples/elf/Makefile b/examples/elf/Makefile index fa688b911..3771e65c0 100644 --- a/examples/elf/Makefile +++ b/examples/elf/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ELF Example -ASRCS = CSRCS = symtab.c MAINSRC = elf_main.c diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile index 561092497..88f2f5eed 100644 --- a/examples/elf/tests/Makefile +++ b/examples/elf/tests/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs ALL_SUBDIRS = errno hello helloxx longjmp mutex pthread signal task struct diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile index ecac55f51..432aeff36 100644 --- a/examples/elf/tests/errno/Makefile +++ b/examples/elf/tests/errno/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile index abee21907..56ca09439 100644 --- a/examples/elf/tests/hello/Makefile +++ b/examples/elf/tests/hello/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile index 24a380cb9..8ca3572ce 100644 --- a/examples/elf/tests/helloxx/Makefile +++ b/examples/elf/tests/helloxx/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile index c15ef4a58..55f784e69 100644 --- a/examples/elf/tests/longjmp/Makefile +++ b/examples/elf/tests/longjmp/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile index 53bf2ac5f..b10e2e442 100644 --- a/examples/elf/tests/mutex/Makefile +++ b/examples/elf/tests/mutex/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile index 26aa9f944..fcf7ec53b 100644 --- a/examples/elf/tests/pthread/Makefile +++ b/examples/elf/tests/pthread/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile index e582c3220..0eee7a8d5 100644 --- a/examples/elf/tests/signal/Makefile +++ b/examples/elf/tests/signal/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile index cdf32c0eb..c8262837e 100644 --- a/examples/elf/tests/struct/Makefile +++ b/examples/elf/tests/struct/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile index c46a251ef..9f621f0f6 100644 --- a/examples/elf/tests/task/Makefile +++ b/examples/elf/tests/task/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/embedlog/Makefile b/examples/embedlog/Makefile index 0e8aa5203..182b6298c 100644 --- a/examples/embedlog/Makefile +++ b/examples/embedlog/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # embedlog example built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_EMBEDLOG_STACKSIZE) # embedlog Example -ASRCS = -CSRCS = MAINSRC = embedlog_main.c CFLAGS += -I$(APPDIR)/include/system diff --git a/examples/fb/Makefile b/examples/fb/Makefile index 50f870528..67bd9796b 100644 --- a/examples/fb/Makefile +++ b/examples/fb/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FB, World! built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_FB_STACKSIZE) # FB, World! Example -ASRCS = -CSRCS = MAINSRC = fb_main.c CONFIG_EXAMPLES_FB_PROGNAME ?= fb$(EXEEXT) diff --git a/examples/fboverlay/Makefile b/examples/fboverlay/Makefile index 6bf6bf159..acb836836 100644 --- a/examples/fboverlay/Makefile +++ b/examples/fboverlay/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # fboverlay built-in application info @@ -43,8 +43,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_FBOVERLAY_STACKSIZE) # fboverlay files -ASRCS = -CSRCS = MAINSRC = fboverlay_main.c CONFIG_EXAMPLES_FBOVERLAY_PROGNAME ?= fboverlay$(EXEEXT) diff --git a/examples/flash_test/Makefile b/examples/flash_test/Makefile index f491afd89..0cc8b52af 100644 --- a/examples/flash_test/Makefile +++ b/examples/flash_test/Makefile @@ -34,7 +34,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -46,8 +46,6 @@ APPNAME = flash_test PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = -CSRCS = MAINSRC = flash_test.c CONFIG_XYZ_PROGNAME ?= flash_test$(EXEEXT) diff --git a/examples/flowc/Makefile b/examples/flowc/Makefile index 328f64dd7..b70e73c20 100644 --- a/examples/flowc/Makefile +++ b/examples/flowc/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FLOWC Test # Target 1 -CSRCS = -MAINSRC = ifeq ($(CONFIG_EXAMPLES_FLOWC_SENDER1),y) CSRCS += flowc_sender.c else diff --git a/examples/ft80x/Makefile b/examples/ft80x/Makefile index 7a47057cf..76e3ef8dd 100644 --- a/examples/ft80x/Makefile +++ b/examples/ft80x/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FT80X example built-in application info @@ -46,7 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_FT80X_STACKSIZE) # FT80X example -ASRCS = CSRCS = ft80x_coprocessor.c ifeq ($(CONFIG_EXAMPLES_FT80X_PRIMITIVES),y) diff --git a/examples/ftpc/Makefile b/examples/ftpc/Makefile index 824af66e0..fed44561b 100644 --- a/examples/ftpc/Makefile +++ b/examples/ftpc/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FTPC Client Application @@ -43,7 +43,6 @@ APPNAME = ftpc PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = CONFIG_EXAMPLES_FTPC_STACKSIZE -ASRCS = CSRCS = ftpc_cmds.c MAINSRC = ftpc_main.c diff --git a/examples/ftpd/Makefile b/examples/ftpd/Makefile index d220a4a64..a72c4dc78 100644 --- a/examples/ftpd/Makefile +++ b/examples/ftpd/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs MAINSRC = ftpd_main.c diff --git a/examples/gpio/Makefile b/examples/gpio/Makefile index 1cc035ee8..07ce8df0b 100644 --- a/examples/gpio/Makefile +++ b/examples/gpio/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # GPIO, World! built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_GPIO_STACKSIZE) # GPIO, World! Example -ASRCS = -CSRCS = MAINSRC = gpio_main.c CONFIG_EXAMPLES_GPIO_PROGNAME ?= gpio$(EXEEXT) diff --git a/examples/gps/Makefile b/examples/gps/Makefile index fdb4292c5..3766ed63e 100644 --- a/examples/gps/Makefile +++ b/examples/gps/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # GPS built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_GPS_STACKSIZE) # GPS Example -ASRCS = -CSRCS = MAINSRC = gps_main.c CONFIG_EXAMPLES_GPS_PROGNAME ?= gps$(EXEEXT) diff --git a/examples/hello/Makefile b/examples/hello/Makefile index 14db580b5..4c072057b 100644 --- a/examples/hello/Makefile +++ b/examples/hello/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_HELLO_STACKSIZE) # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = hello_main.c CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT) diff --git a/examples/helloxx/Makefile b/examples/helloxx/Makefile index 59205756b..2c4e5998e 100644 --- a/examples/helloxx/Makefile +++ b/examples/helloxx/Makefile @@ -33,13 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! C++ Example -ASRCS = -CSRCS = -CXXSRCS = MAINSRC = helloxx_main.cxx CONFIG_EXAMPLES_HELLOXX_PROGNAME ?= helloxx$(EXEEXT) diff --git a/examples/hidkbd/Makefile b/examples/hidkbd/Makefile index c8fa11f07..8f1811ea9 100644 --- a/examples/hidkbd/Makefile +++ b/examples/hidkbd/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # USB Host HID keyboard Example @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_HIDKBD_STACKSIZE) # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = hidkbd_main.c CONFIG_EXAMPLES_HIDKBD_PROGNAME ?= hidkbd$(EXEEXT) diff --git a/examples/i2schar/Makefile b/examples/i2schar/Makefile index 3e3b81e26..659d934c3 100644 --- a/examples/i2schar/Makefile +++ b/examples/i2schar/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # I2S character driver test -ASRCS = -CSRCS = ifeq ($(CONFIG_EXAMPLES_I2SCHAR_TX),y) CSRCS += i2schar_transmitter.c endif diff --git a/examples/i2sloop/Makefile b/examples/i2sloop/Makefile index 0c68da170..4ce1f9f9f 100644 --- a/examples/i2sloop/Makefile +++ b/examples/i2sloop/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # I2S character driver test -ASRCS = -CSRCS = MAINSRC = i2sloop_main.c CONFIG_XYZ_PROGNAME ?= i2sloop$(EXEEXT) diff --git a/examples/igmp/Makefile b/examples/igmp/Makefile index b7a10a7d5..72f2b3c1b 100644 --- a/examples/igmp/Makefile +++ b/examples/igmp/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs APPNAME = igmp PRIORITY = SCHED_PRIORITY_DEFAULT @@ -41,8 +41,6 @@ STACKSIZE = 1024 # IGMP Networking Example -ASRCS = -CSRCS = MAINSRC = igmp.c CONFIG_XYZ_PROGNAME ?= igmp$(EXEEXT) diff --git a/examples/ina219/Makefile b/examples/ina219/Makefile index 7b361d560..dc5b75fc5 100644 --- a/examples/ina219/Makefile +++ b/examples/ina219/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! built-in application info @@ -48,8 +48,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_INA219_STACKSIZE) # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = ina219_main.c CONFIG_EXAMPLES_INA219_PROGNAME ?= ina219$(EXEEXT) diff --git a/examples/ina226/Makefile b/examples/ina226/Makefile index 5b9b3d43a..e81bb5576 100644 --- a/examples/ina226/Makefile +++ b/examples/ina226/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # INA226 built-in application info @@ -48,8 +48,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_INA226_STACKSIZE) # INA226 Example -ASRCS = -CSRCS = MAINSRC = ina226_main.c CONFIG_EXAMPLES_INA226_PROGNAME ?= ina226$(EXEEXT) diff --git a/examples/ini_dumper/Makefile b/examples/ini_dumper/Makefile index e921aa7f9..ea80aab63 100644 --- a/examples/ini_dumper/Makefile +++ b/examples/ini_dumper/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ini_dumper example built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_INI_DUMPER_STACKSIZE) # ini_dumper Example -ASRCS = -CSRCS = MAINSRC = ini_dumper_main.c CFLAGS += -I$(APPDIR)/include/fsutils diff --git a/examples/ipforward/Makefile b/examples/ipforward/Makefile index 920b0384d..6c814bf69 100644 --- a/examples/ipforward/Makefile +++ b/examples/ipforward/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_IPFORWARD_STACKSIZE) # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = ipforward.c CONFIG_EXAMPLES_IPFORWARD_PROGNAME ?= ipfwd$(EXEEXT) diff --git a/examples/json/Makefile b/examples/json/Makefile index b9812766d..7adbeda3c 100644 --- a/examples/json/Makefile +++ b/examples/json/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # cJSON built-in application info @@ -41,8 +41,6 @@ APPNAME = json PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = -CSRCS = MAINSRC = json_main.c CONFIG_XYZ_PROGNAME ?= json$(EXEEXT) diff --git a/examples/leds/Makefile b/examples/leds/Makefile index 9cf458d46..8578057ed 100644 --- a/examples/leds/Makefile +++ b/examples/leds/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LED driver test built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_LEDS_STACKSIZE) # LED driver test -ASRCS = -CSRCS = MAINSRC = leds_main.c CONFIG_EXAMPLES_LEDS_PROGNAME ?= leds$(EXEEXT) diff --git a/examples/lis3dsh_reader/Makefile b/examples/lis3dsh_reader/Makefile index 4fd493434..95f2f02d0 100644 --- a/examples/lis3dsh_reader/Makefile +++ b/examples/lis3dsh_reader/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs APPNAME = lis3dsh_reader PRIORITY = SCHED_PRIORITY_DEFAULT @@ -41,8 +41,6 @@ STACKSIZE = 2048 # LIS3DSH reader example -ASRCS = -CSRCS = MAINSRC = lis3dsh_reader_main.c CONFIG_FLOX_IMUTEST_PROGNAME ?= lis3dsh_reader$(EXEEXT) diff --git a/examples/lsm330spi_test/Makefile b/examples/lsm330spi_test/Makefile index f73e3ff98..488657394 100644 --- a/examples/lsm330spi_test/Makefile +++ b/examples/lsm330spi_test/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_EXAMPLES_LSM330SPI_TEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT CONFIG_EXAMPLES_LSM330SPI_TEST_STACKSIZE ?= 2048 @@ -44,8 +44,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_LSM330SPI_TEST_STACKSIZE) # LSM330 sensor test Example -ASRCS = -CSRCS = MAINSRC = lsm330spi_test_main.c CONFIG_EXAMPLES_LSM330SPI_TEST_PROGNAME ?= lsm330spi_test$(EXEEXT) diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile index 4a9e32f36..c55e13738 100644 --- a/examples/lvgldemo/Makefile +++ b/examples/lvgldemo/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LittleVGL demo built-in application info @@ -46,7 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE) # LittleVGL demo Example -ASRCS = CSRCS += fbdev.c tp.c tp_cal.c ifeq ($(CONFIG_EXAMPLES_LVGLDEMO_SIMPLE),y) CSRCS += demo.c diff --git a/examples/max31855/Makefile b/examples/max31855/Makefile index f216db3e2..85f00ef12 100644 --- a/examples/max31855/Makefile +++ b/examples/max31855/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # max31855 built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_MAX31855_STACKSIZE) # max31855 Example -ASRCS = -CSRCS = MAINSRC = max31855_main.c CONFIG_EXAMPLES_MAX31855_PROGNAME ?= max31855$(EXEEXT) diff --git a/examples/media/Makefile b/examples/media/Makefile index c6339ee53..f14ad7583 100644 --- a/examples/media/Makefile +++ b/examples/media/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Media test application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # Media test application files -ASRCS = -CSRCS = MAINSRC = media_main.c CONFIG_EXAMPLES_MEDIA_PROGNAME ?= media$(EXEEXT) diff --git a/examples/mld/Makefile b/examples/mld/Makefile index 7e16ddbe6..9671e1008 100644 --- a/examples/mld/Makefile +++ b/examples/mld/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # MLD Networking Example @@ -46,8 +46,6 @@ APPNAME = $(CONFIG_EXAMPLES_MLD_APPNAME) PRIORITY = $(CONFIG_EXAMPLES_MLD_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_MLD_STACKSIZE) -ASRCS = -CSRCS = MAINSRC = mld_main.c PROGNAME = $(CONFIG_EXAMPLES_MLD_PROGNAME) diff --git a/examples/mlx90614/Makefile b/examples/mlx90614/Makefile index 7e0dc78f3..a2750d7d2 100644 --- a/examples/mlx90614/Makefile +++ b/examples/mlx90614/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # MLX90614 built-in application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # MLX90614 Test -ASRCS = -CSRCS = MAINSRC = mlx90614_main.c CONFIG_EXAMPLES_MLX90614_PROGNAME ?= mlx90614$(EXEEXT) diff --git a/examples/mm/Makefile b/examples/mm/Makefile index aade9977c..d42c07a46 100644 --- a/examples/mm/Makefile +++ b/examples/mm/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Memory Management Test @@ -44,8 +44,6 @@ APPNAME = mm PRIORITY = $(CONFIG_EXAMPLES_MM_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_MM_STACKSIZE) -ASRCS = -CSRCS = MAINSRC = mm_main.c CONFIG_EXAMPLES_MM_PROGNAME ?= mm$(EXEEXT) diff --git a/examples/modbus/Makefile b/examples/modbus/Makefile index b793d882c..72d759919 100644 --- a/examples/modbus/Makefile +++ b/examples/modbus/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FreeModBus demo built-in application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # FreeModBus demo -ASRCS = -CSRCS = MAINSRC = modbus_main.c CONFIG_XYZ_PROGNAME ?= modbus$(EXEEXT) diff --git a/examples/modbusmaster/Makefile b/examples/modbusmaster/Makefile index 184487950..b7f85670f 100644 --- a/examples/modbusmaster/Makefile +++ b/examples/modbusmaster/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Modbus Master built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_MODBUSMASTER_STACKSIZE) # Modbus Master Example -ASRCS = -CSRCS = MAINSRC = mbmaster_main.c CONFIG_EXAMPLES_MODBUSMASTER_PROGNAME ?= mbmaster$(EXEEXT) diff --git a/examples/module/Makefile b/examples/module/Makefile index ba6af9157..b96215310 100644 --- a/examples/module/Makefile +++ b/examples/module/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Module example built-in application info diff --git a/examples/module/drivers/Makefile b/examples/module/drivers/Makefile index 6dd4b9375..b4cebac6e 100644 --- a/examples/module/drivers/Makefile +++ b/examples/module/drivers/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs ALL_SUBDIRS = chardev diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile index e7ceaba49..ae8396f0a 100644 --- a/examples/module/drivers/chardev/Makefile +++ b/examples/module/drivers/chardev/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs OBJEXT ?= .o diff --git a/examples/mount/Makefile b/examples/mount/Makefile index 34db50a99..2de06fe45 100644 --- a/examples/mount/Makefile +++ b/examples/mount/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # mount() test APPNAME = mount -ASRCS = CSRCS = ramdisk.c MAINSRC = mount_main.c diff --git a/examples/mtdpart/Makefile b/examples/mtdpart/Makefile index 5cb2b676c..c302bf209 100644 --- a/examples/mtdpart/Makefile +++ b/examples/mtdpart/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # MTD Partition Example APPNAME = mtdpart -ASRCS = -CSRCS = MAINSRC = mtdpart_main.c CONFIG_XYZ_PROGNAME ?= mtdpart$(EXEEXT) diff --git a/examples/mtdrwb/Makefile b/examples/mtdrwb/Makefile index 23549680f..e1fa4447c 100644 --- a/examples/mtdrwb/Makefile +++ b/examples/mtdrwb/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # MTD R/W buffer test Example APPNAME = mtdrwb -ASRCS = -CSRCS = MAINSRC = mtdrwb_main.c CONFIG_EXAMPLES_MTDRWB_PROGNAME ?= mtdrwb$(EXEEXT) diff --git a/examples/netloop/Makefile b/examples/netloop/Makefile index 38267ce31..322a61b7b 100644 --- a/examples/netloop/Makefile +++ b/examples/netloop/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Network loopback Example -ASRCS = CSRCS = lo_listener.c MAINSRC = lo_main.c diff --git a/examples/netpkt/Makefile b/examples/netpkt/Makefile index 920b51b0f..1b8b06b37 100644 --- a/examples/netpkt/Makefile +++ b/examples/netpkt/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Network packet socket example @@ -43,8 +43,6 @@ STACKSIZE = 2048 # MDIO tool -ASRCS = -CSRCS = MAINSRC = netpkt_main.c CONFIG_XYZ_PROGNAME ?= netpkt$(EXEEXT) diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index 6d0d4a3a7..c0462dfac 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic TCP networking test diff --git a/examples/nrf24l01_term/Makefile b/examples/nrf24l01_term/Makefile index 71739fd19..dc4aaf9d5 100644 --- a/examples/nrf24l01_term/Makefile +++ b/examples/nrf24l01_term/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic nRF24L01+ terminal demonstration -ASRCS = -CSRCS = MAINSRC = nrf24l01_term.c CONFIG_XYZ_PROGNAME ?= nrf24l01_term$(EXEEXT) diff --git a/examples/null/Makefile b/examples/null/Makefile index 72ddef2f5..da4d2ff63 100644 --- a/examples/null/Makefile +++ b/examples/null/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # The NULL example built-in application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # The smallest thing you can build -- the NULL example. -ASRCS = -CSRCS = MAINSRC = null_main.c CONFIG_XYZ_PROGNAME ?= null$(EXEEXT) diff --git a/examples/nunchuck/Makefile b/examples/nunchuck/Makefile index e70c34d94..099941531 100644 --- a/examples/nunchuck/Makefile +++ b/examples/nunchuck/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Nunchuck Example -ASRCS = -CSRCS = MAINSRC = nunchuck_main.c CONFIG_NUNCHUCK_PROGNAME ?= nunchuck$(EXEEXT) diff --git a/examples/nx/Makefile b/examples/nx/Makefile index 5ab94ef49..c8e9fe378 100644 --- a/examples/nx/Makefile +++ b/examples/nx/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = nx_events.c nx_kbdin.c MAINSRC = nx_main.c diff --git a/examples/nxdemo/Makefile b/examples/nxdemo/Makefile index a1761fb90..50e2559d0 100644 --- a/examples/nxdemo/Makefile +++ b/examples/nxdemo/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = nxdemo_bkgd.c nxdemo_listener.c MAINSRC = nxdemo_main.c diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile index 065a944bf..5dda8be98 100644 --- a/examples/nxflat/Makefile +++ b/examples/nxflat/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NXFLAT Example diff --git a/examples/nxflat/tests/errno/Makefile b/examples/nxflat/tests/errno/Makefile index d161a6496..92024459f 100644 --- a/examples/nxflat/tests/errno/Makefile +++ b/examples/nxflat/tests/errno/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = errno diff --git a/examples/nxflat/tests/hello++/Makefile b/examples/nxflat/tests/hello++/Makefile index fb8922a1b..5d85154a0 100644 --- a/examples/nxflat/tests/hello++/Makefile +++ b/examples/nxflat/tests/hello++/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN1 = hello++1 BIN2 = hello++2 diff --git a/examples/nxflat/tests/hello/Makefile b/examples/nxflat/tests/hello/Makefile index 2efa6dbca..503429f5c 100644 --- a/examples/nxflat/tests/hello/Makefile +++ b/examples/nxflat/tests/hello/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = hello diff --git a/examples/nxflat/tests/longjmp/Makefile b/examples/nxflat/tests/longjmp/Makefile index dbfd5fc91..ab44b331d 100644 --- a/examples/nxflat/tests/longjmp/Makefile +++ b/examples/nxflat/tests/longjmp/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = longjmp diff --git a/examples/nxflat/tests/mutex/Makefile b/examples/nxflat/tests/mutex/Makefile index 526099819..3eed158af 100644 --- a/examples/nxflat/tests/mutex/Makefile +++ b/examples/nxflat/tests/mutex/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = mutex diff --git a/examples/nxflat/tests/pthread/Makefile b/examples/nxflat/tests/pthread/Makefile index 663a46929..519bf5a8b 100644 --- a/examples/nxflat/tests/pthread/Makefile +++ b/examples/nxflat/tests/pthread/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config # Current configuration --include $(TOPDIR)/Make.defs # Basic make _info +include $(TOPDIR)/Make.defs # Basic make _info BIN = pthread diff --git a/examples/nxflat/tests/signal/Makefile b/examples/nxflat/tests/signal/Makefile index 43e4742b5..59820f5a4 100644 --- a/examples/nxflat/tests/signal/Makefile +++ b/examples/nxflat/tests/signal/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = signal diff --git a/examples/nxflat/tests/struct/Makefile b/examples/nxflat/tests/struct/Makefile index bee07d1e5..db1a9352b 100644 --- a/examples/nxflat/tests/struct/Makefile +++ b/examples/nxflat/tests/struct/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CFLAGS += -I. diff --git a/examples/nxflat/tests/task/Makefile b/examples/nxflat/tests/task/Makefile index afd4754b6..b2789be9b 100644 --- a/examples/nxflat/tests/task/Makefile +++ b/examples/nxflat/tests/task/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = task diff --git a/examples/nxhello/Makefile b/examples/nxhello/Makefile index c9b5c68f7..f8fc55699 100644 --- a/examples/nxhello/Makefile +++ b/examples/nxhello/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = nxhello_bkgd.c nxhello_listener.c MAINSRC = nxhello_main.c diff --git a/examples/nximage/Makefile b/examples/nximage/Makefile index 7e953d8c0..d83959ee5 100644 --- a/examples/nximage/Makefile +++ b/examples/nximage/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = nximage_bkgd.c nximage_bitmap.c nximage_listener.c MAINSRC = nximage_main.c diff --git a/examples/nxlines/Makefile b/examples/nxlines/Makefile index 7f642f0e3..bd3067553 100644 --- a/examples/nxlines/Makefile +++ b/examples/nxlines/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = nxlines_bkgd.c nxlines_listener.c MAINSRC = nxlines_main.c diff --git a/examples/nxterm/Makefile b/examples/nxterm/Makefile index a92d492fb..2d54a7e29 100644 --- a/examples/nxterm/Makefile +++ b/examples/nxterm/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Console Example. -ASRCS = CSRCS = nxterm_toolbar.c nxterm_wndo.c nxterm_listener.c MAINSRC = nxterm_main.c diff --git a/examples/nxtext/Makefile b/examples/nxtext/Makefile index 74e6c030d..f7e89dd17 100644 --- a/examples/nxtext/Makefile +++ b/examples/nxtext/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = nxtext_bkgd.c nxtext_popup.c nxtext_putc.c MAINSRC = nxtext_main.c nxtext_listener.c diff --git a/examples/obd2/Makefile b/examples/obd2/Makefile index df7fe361c..2f38467c3 100644 --- a/examples/obd2/Makefile +++ b/examples/obd2/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # OBD2 application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_OBD2_STACKSIZE) # OBD2 Example -ASRCS = -CSRCS = MAINSRC = obd2_main.c CONFIG_EXAMPLES_OBD2_PROGNAME ?= obd2$(EXEEXT) diff --git a/examples/oneshot/Makefile b/examples/oneshot/Makefile index 2cd0bd326..049f90aff 100644 --- a/examples/oneshot/Makefile +++ b/examples/oneshot/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Oneshot timer built-in application info @@ -49,8 +49,6 @@ PROGNAME = $(CONFIG_EXAMPLES_ONESHOT_PROGNAME) # Oneshot timer example -ASRCS = -CSRCS = MAINSRC = oneshot_main.c MODULE = CONFIG_EXAMPLES_ONESHOT diff --git a/examples/pashello/Makefile b/examples/pashello/Makefile index 07c09c377..4539185f1 100644 --- a/examples/pashello/Makefile +++ b/examples/pashello/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Pascal Add-On Example @@ -47,7 +47,6 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)insn$(DELIM)include"} -ASRCS = CSRCS = device.c MAINSRC = pashello.c diff --git a/examples/pca9635/Makefile b/examples/pca9635/Makefile index 3bb9a9225..6c274336e 100644 --- a/examples/pca9635/Makefile +++ b/examples/pca9635/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # PCA9635 built-in application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # PCA9635 Test -ASRCS = -CSRCS = MAINSRC = pca9635_main.c CONFIG_EXAMPLES_PCA9635_PROGNAME ?= pca9635$(EXEEXT) diff --git a/examples/pdcurses/Makefile b/examples/pdcurses/Makefile index 4db32d326..e350ddf64 100644 --- a/examples/pdcurses/Makefile +++ b/examples/pdcurses/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs +include $(TOPDIR)/Make.defs # pdcurses demo programs diff --git a/examples/pf_ieee802154/Makefile b/examples/pf_ieee802154/Makefile index d791b77b1..e40f6867d 100644 --- a/examples/pf_ieee802154/Makefile +++ b/examples/pf_ieee802154/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # PF_IEEE802154 Socket Test diff --git a/examples/pipe/Makefile b/examples/pipe/Makefile index c6b8a972a..7b593b801 100644 --- a/examples/pipe/Makefile +++ b/examples/pipe/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Pipe Example APPNAME = pipe -ASRCS = CSRCS = transfer_test.c interlock_test.c redirect_test.c MAINSRC = pipe_main.c diff --git a/examples/poll/Makefile b/examples/poll/Makefile index 8a7a6960e..5025488e2 100644 --- a/examples/poll/Makefile +++ b/examples/poll/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CSRCS = poll_listener.c select_listener.c net_listener.c net_reader.c MAINSRC = poll_main.c diff --git a/examples/poll/Makefile.host b/examples/poll/Makefile.host index 1e6a72089..c91f4a930 100644 --- a/examples/poll/Makefile.host +++ b/examples/poll/Makefile.host @@ -35,7 +35,6 @@ # TOPDIR must be defined on the make command line -include $(TOPDIR)/.config include $(TOPDIR)/Make.defs SRC = host.c diff --git a/examples/popen/Makefile b/examples/popen/Makefile index 1b2f5455b..446b23c56 100644 --- a/examples/popen/Makefile +++ b/examples/popen/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # popen() built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_POPEN_STACKSIZE) # popen() Example -ASRCS = -CSRCS = MAINSRC = popen_main.c CONFIG_EXAMPLES_POPEN_PROGNAME ?= popen$(EXEEXT) diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile index d0e280cb8..f3da52eb3 100644 --- a/examples/posix_spawn/Makefile +++ b/examples/posix_spawn/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ELF Example -ASRCS = CSRCS = symtab.c MAINSRC = spawn_main.c diff --git a/examples/posix_spawn/filesystem/Makefile b/examples/posix_spawn/filesystem/Makefile index 2efc1fed8..cd29039c9 100644 --- a/examples/posix_spawn/filesystem/Makefile +++ b/examples/posix_spawn/filesystem/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs SPAWN_DIR = $(APPDIR)$(DELIM)examples$(DELIM)posix_spawn diff --git a/examples/posix_spawn/filesystem/hello/Makefile b/examples/posix_spawn/filesystem/hello/Makefile index 728f49904..45e0d093a 100644 --- a/examples/posix_spawn/filesystem/hello/Makefile +++ b/examples/posix_spawn/filesystem/hello/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = hello diff --git a/examples/posix_spawn/filesystem/redirect/Makefile b/examples/posix_spawn/filesystem/redirect/Makefile index fa1a9a818..7c598101c 100644 --- a/examples/posix_spawn/filesystem/redirect/Makefile +++ b/examples/posix_spawn/filesystem/redirect/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = redirect diff --git a/examples/powerled/Makefile b/examples/powerled/Makefile index b6d6da013..ecd5ae125 100644 --- a/examples/powerled/Makefile +++ b/examples/powerled/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Powerled Example APPNAME = powerled -ASRCS = -CSRCS = MAINSRC = powerled_main.c CONFIG_EXAMPLES_POWERLED_PROGNAME ?= powerled$(EXEEXT) diff --git a/examples/powermonitor/Makefile b/examples/powermonitor/Makefile index fb2333a26..31610d5ea 100644 --- a/examples/powermonitor/Makefile +++ b/examples/powermonitor/Makefile @@ -32,14 +32,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs APPNAME = powermonitor PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 768 -ASRCS = -CSRCS = MAINSRC = powermonitor_main.c CFLAGS += -I../../../nuttx/arch/arm/src -I../../../nuttx/arch/arm/src/common diff --git a/examples/pppd/Makefile b/examples/pppd/Makefile index b9101d252..3557c0834 100644 --- a/examples/pppd/Makefile +++ b/examples/pppd/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # pppd Example -ASRCS = -CSRCS = MAINSRC = pppd_main.c CONFIG_EXAMPLES_PPPD_PROGNAME ?= pppd$(EXEEXT) diff --git a/examples/pty_test/Makefile b/examples/pty_test/Makefile index df663630b..01773baad 100644 --- a/examples/pty_test/Makefile +++ b/examples/pty_test/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_PTYTEST_STACKSIZE) # PTY Test! Example -ASRCS = -CSRCS = CFLAGS += -I$(APPDIR)/include MAINSRC = pty_test.c diff --git a/examples/pwfb/Makefile b/examples/pwfb/Makefile index 395618fc1..e2bebaca0 100644 --- a/examples/pwfb/Makefile +++ b/examples/pwfb/Makefile @@ -33,14 +33,13 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX per-window frame buffer graphics example. NXGLYPHS = $(APPDIR)$(DELIM)graphics$(DELIM)nxglyphs CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(NXGLYPHS)$(DELIM)include"} -ASRCS = CSRCS = pwfb_events.c pwfb_motion.c MAINSRC = pwfb_main.c diff --git a/examples/pwlines/Makefile b/examples/pwlines/Makefile index 3c71ea7f3..f197f1a31 100644 --- a/examples/pwlines/Makefile +++ b/examples/pwlines/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = CSRCS = pwlines_events.c pwlines_motion.c pwlines_update.c MAINSRC = pwlines_main.c diff --git a/examples/pwm/Makefile b/examples/pwm/Makefile index e1dec4d71..8203a73eb 100644 --- a/examples/pwm/Makefile +++ b/examples/pwm/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # PWM Example. -ASRCS = -CSRCS = MAINSRC = pwm_main.c CONFIG_XYZ_PROGNAME ?= pwm$(EXEEXT) diff --git a/examples/qencoder/Makefile b/examples/qencoder/Makefile index 231b8dd6c..fbda93afb 100644 --- a/examples/qencoder/Makefile +++ b/examples/qencoder/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = -CSRCS = MAINSRC = qe_main.c CONFIG_XYZ_PROGNAME ?= qencoder$(EXEEXT) diff --git a/examples/random/Makefile b/examples/random/Makefile index 306866543..f4060907e 100644 --- a/examples/random/Makefile +++ b/examples/random/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # /dev/random test @@ -41,8 +41,6 @@ APPNAME = rand PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = -CSRCS = MAINSRC = random_main.c CONFIG_XYZ_PROGNAME ?= random$(EXEEXT) diff --git a/examples/relays/Makefile b/examples/relays/Makefile index 4a9cbb031..5a950fef3 100644 --- a/examples/relays/Makefile +++ b/examples/relays/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # relays Example -ASRCS = -CSRCS = MAINSRC = relays_main.c CONFIG_XYZ_PROGNAME ?= relays$(EXEEXT) diff --git a/examples/rfid_readuid/Makefile b/examples/rfid_readuid/Makefile index 4067c8c43..6cb54fdd7 100644 --- a/examples/rfid_readuid/Makefile +++ b/examples/rfid_readuid/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # RFID Read UID built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_RFID_READUID_STACKSIZE) # RFID Read UID Example -ASRCS = -CSRCS = MAINSRC = rfid_readuid.c CONFIG_EXAMPLES_RFID_READUID_PROGNAME ?= rfid_readuid$(EXEEXT) diff --git a/examples/rgbled/Makefile b/examples/rgbled/Makefile index 44da4c4a9..dca48ddb1 100644 --- a/examples/rgbled/Makefile +++ b/examples/rgbled/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # RGBLED built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_RGBLED_STACKSIZE) # RGBLED Example -ASRCS = -CSRCS = MAINSRC = rgbled.c CONFIG_EXAMPLES_RGBLED_PROGNAME ?= rgbled$(EXEEXT) diff --git a/examples/romfs/Makefile b/examples/romfs/Makefile index d9de4c417..116eaa69b 100644 --- a/examples/romfs/Makefile +++ b/examples/romfs/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ROMFS built-in application info diff --git a/examples/sendmail/Makefile b/examples/sendmail/Makefile index fa9487420..eabbbb6ea 100644 --- a/examples/sendmail/Makefile +++ b/examples/sendmail/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Sendmail SMTP Example APPNAME = sendmail -ASRCS = -CSRCS = MAINSRC = sendmail_main.c CONFIG_XYZ_PROGNAME ?= sendmail$(EXEEXT) diff --git a/examples/serialblaster/Makefile b/examples/serialblaster/Makefile index 5eda0d4be..3f6ea4e22 100644 --- a/examples/serialblaster/Makefile +++ b/examples/serialblaster/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # For testing: Blast canned characters at a designated serial port -ASRCS = -CSRCS = MAINSRC = serialblaster_main.c CONFIG_XYZ_PROGNAME ?= serialblaster$(EXEEXT) diff --git a/examples/serialrx/Makefile b/examples/serialrx/Makefile index d2fd40de6..3e78e67fd 100644 --- a/examples/serialrx/Makefile +++ b/examples/serialrx/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # For testing: Blast canned characters at a designated serial port -ASRCS = -CSRCS = MAINSRC = serialrx_main.c CONFIG_XYZ_PROGNAME ?= serialrx$(EXEEXT) diff --git a/examples/serloop/Makefile b/examples/serloop/Makefile index 06b826632..a41e4c91b 100644 --- a/examples/serloop/Makefile +++ b/examples/serloop/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Mindlessly simple console loopack test APPNAME = serloop -ASRCS = -CSRCS = MAINSRC = serloop_main.c CONFIG_XYZ_PROGNAME ?= serloop$(EXEEXT) diff --git a/examples/slcd/Makefile b/examples/slcd/Makefile index b86944dcf..d3def576b 100644 --- a/examples/slcd/Makefile +++ b/examples/slcd/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! built-in application info @@ -43,8 +43,6 @@ STACKSIZE = 2048 # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = slcd_main.c CONFIG_XYZ_PROGNAME ?= slcd$(EXEEXT) diff --git a/examples/smps/Makefile b/examples/smps/Makefile index 9e888651c..b8decb642 100644 --- a/examples/smps/Makefile +++ b/examples/smps/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Smps Example APPNAME = smps -ASRCS = -CSRCS = MAINSRC = smps_main.c CONFIG_EXAMPLES_SMPS_PROGNAME ?= smps$(EXEEXT) diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile index 309345630..8b37be7de 100644 --- a/examples/sotest/Makefile +++ b/examples/sotest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/sotest/lib/Makefile b/examples/sotest/lib/Makefile index f65edb743..d13f20e0b 100644 --- a/examples/sotest/lib/Makefile +++ b/examples/sotest/lib/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs ALL_SUBDIRS = sotest diff --git a/examples/sotest/lib/modprint/Makefile b/examples/sotest/lib/modprint/Makefile index d7a6f6977..3dc87a7c9 100644 --- a/examples/sotest/lib/modprint/Makefile +++ b/examples/sotest/lib/modprint/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs OBJEXT ?= .o diff --git a/examples/sotest/lib/sotest/Makefile b/examples/sotest/lib/sotest/Makefile index 89972d561..b2793673f 100644 --- a/examples/sotest/lib/sotest/Makefile +++ b/examples/sotest/lib/sotest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs OBJEXT ?= .o diff --git a/examples/stat/Makefile b/examples/stat/Makefile index 4ec2e05bd..a15f2a9cf 100644 --- a/examples/stat/Makefile +++ b/examples/stat/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Stat built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_STAT_STACKSIZE) # Stat test -ASRCS = -CSRCS = MAINSRC = stat_main.c CONFIG_EXAMPLES_STAT_PROGNAME ?= stat$(EXEEXT) diff --git a/examples/sx127x_demo/Makefile b/examples/sx127x_demo/Makefile index 79d9e557f..09204c3cb 100644 --- a/examples/sx127x_demo/Makefile +++ b/examples/sx127x_demo/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic sx127x+ demonstration -ASRCS = -CSRCS = MAINSRC = sx127x_demo.c CONFIG_XYZ_PROGNAME ?= sx127x_demo$(EXEEXT) diff --git a/examples/system/Makefile b/examples/system/Makefile index 180e12824..ed4e8975b 100644 --- a/examples/system/Makefile +++ b/examples/system/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # system() built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_SYSTEM_STACKSIZE) # system() Example -ASRCS = -CSRCS = MAINSRC = system_main.c CONFIG_EXAMPLES_SYSTEM_PROGNAME ?= system$(EXEEXT) diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile index 028a36877..426a54460 100644 --- a/examples/tcpblaster/Makefile +++ b/examples/tcpblaster/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic TCP networking test diff --git a/examples/tcpecho/Makefile b/examples/tcpecho/Makefile index 466a1b77f..58025af2d 100644 --- a/examples/tcpecho/Makefile +++ b/examples/tcpecho/Makefile @@ -36,7 +36,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Discover built-in application info @@ -44,8 +44,6 @@ APPNAME = tcpecho PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = -CSRCS = MAINSRC = tcpecho_main.c CONFIG_XYZ_PROGNAME ?= tcpecho$(EXEEXT) diff --git a/examples/telnetd/Makefile b/examples/telnetd/Makefile index 3d2800a3f..b8a21f980 100644 --- a/examples/telnetd/Makefile +++ b/examples/telnetd/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Telnetd Example -ASRCS = -CSRCS = MAINSRC = telnetd.c CONFIG_XYZ_PROGNAME ?= telnetd$(EXEEXT) diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile index d1a5fd4e2..1fec57d07 100644 --- a/examples/thttpd/Makefile +++ b/examples/thttpd/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # THTTPD Web Server Example diff --git a/examples/thttpd/content/Makefile.binfs b/examples/thttpd/content/Makefile.binfs index 999f9cdb7..793dd1e16 100644 --- a/examples/thttpd/content/Makefile.binfs +++ b/examples/thttpd/content/Makefile.binfs @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_THTTPD_CGI_PRIORITY ?= 100 CONFIG_THTTPD_CGI_STACKSIZE ?= 2048 diff --git a/examples/thttpd/content/hello/Makefile b/examples/thttpd/content/hello/Makefile index 046684981..0d8f6cc12 100644 --- a/examples/thttpd/content/hello/Makefile +++ b/examples/thttpd/content/hello/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs BIN = hello diff --git a/examples/thttpd/content/tasks/Makefile b/examples/thttpd/content/tasks/Makefile index 0754b1ed4..22b655733 100644 --- a/examples/thttpd/content/tasks/Makefile +++ b/examples/thttpd/content/tasks/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs OBJEXT ?= .o DELIM ?= / diff --git a/examples/tiff/Makefile b/examples/tiff/Makefile index 7f682c7da..ee6a39032 100644 --- a/examples/tiff/Makefile +++ b/examples/tiff/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # TIFF Unit Test diff --git a/examples/timer/Makefile b/examples/timer/Makefile index c2e047507..859a8e96b 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Timer built-in application info @@ -49,8 +49,6 @@ PROGNAME = $(CONFIG_EXAMPLES_TIMER_PROGNAME) # Timer example -ASRCS = -CSRCS = MAINSRC = timer_main.c MODULE = CONFIG_EXAMPLES_TIMER diff --git a/examples/touchscreen/Makefile b/examples/touchscreen/Makefile index a8a04c473..a933baac2 100644 --- a/examples/touchscreen/Makefile +++ b/examples/touchscreen/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -ASRCS = -CSRCS = MAINSRC = tc_main.c CONFIG_XYZ_PROGNAME ?= touchscreen$(EXEEXT) diff --git a/examples/udgram/Makefile b/examples/udgram/Makefile index ecccb52d3..e6deb6aa4 100644 --- a/examples/udgram/Makefile +++ b/examples/udgram/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic Unix domain networking test diff --git a/examples/udp/Makefile b/examples/udp/Makefile index fabf8436d..fb236c257 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # UDP Test diff --git a/examples/udpblaster/Makefile b/examples/udpblaster/Makefile index 4ebed385a..833709cfe 100644 --- a/examples/udpblaster/Makefile +++ b/examples/udpblaster/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic TCP networking test diff --git a/examples/uid/Makefile b/examples/uid/Makefile index 5b6c4993c..8a2e3dafd 100644 --- a/examples/uid/Makefile +++ b/examples/uid/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # UID/GID built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_UID_STACKSIZE) # UID/GID Example -ASRCS = -CSRCS = MAINSRC = uid_main.c CONFIG_EXAMPLES_UID_PROGNAME ?= uid$(EXEEXT) diff --git a/examples/unionfs/Makefile b/examples/unionfs/Makefile index 94a6f5a66..e1d66cf60 100644 --- a/examples/unionfs/Makefile +++ b/examples/unionfs/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # UNIONFS built-in application info diff --git a/examples/usbserial/Makefile b/examples/usbserial/Makefile index cb766f2a1..039dcb755 100644 --- a/examples/usbserial/Makefile +++ b/examples/usbserial/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # USB serial device example # Built-in application info diff --git a/examples/usbserial/Makefile.host b/examples/usbserial/Makefile.host index 6abf77966..e56f49df8 100644 --- a/examples/usbserial/Makefile.host +++ b/examples/usbserial/Makefile.host @@ -35,7 +35,7 @@ # TOPDIR must be defined on the make command line --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs SRC = host.c BIN = host$(EXEEXT) diff --git a/examples/userfs/Makefile b/examples/userfs/Makefile index 453947da0..ac3d3694e 100644 --- a/examples/userfs/Makefile +++ b/examples/userfs/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # UserFS test application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_USERFS_STACKSIZE) # UserFS test application source files -ASRCS = -CSRCS = MAINSRC = userfs_main.c CONFIG_EXAMPLES_USERFS_PROGNAME ?= userfs$(EXEEXT) diff --git a/examples/usrsocktest/Makefile b/examples/usrsocktest/Makefile index b84a67a3c..cab0028be 100644 --- a/examples/usrsocktest/Makefile +++ b/examples/usrsocktest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # USRSOCK Test built-in application info @@ -46,7 +46,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_USRSOCKTEST_STACKSIZE) # NuttX USRSOCK Test -ASRCS = CSRCS = usrsocktest_daemon.c usrsocktest_basic_connect.c CSRCS += usrsocktest_basic_daemon.c usrsocktest_basic_getsockname.c CSRCS += usrsocktest_basic_getsockopt.c usrsocktest_basic_send.c diff --git a/examples/ustream/Makefile b/examples/ustream/Makefile index 20d7f2b44..b9033d1c3 100644 --- a/examples/ustream/Makefile +++ b/examples/ustream/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Basic Unix domain networking test diff --git a/examples/veml6070/Makefile b/examples/veml6070/Makefile index 843941f51..439080f13 100644 --- a/examples/veml6070/Makefile +++ b/examples/veml6070/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # VEML6070 UltraViolet sensor example built-in application info @@ -48,8 +48,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_VEML6070_STACKSIZE) # VEML6070 UltraViolet sensor example -ASRCS = -CSRCS = MAINSRC = veml6070_main.c CONFIG_EXAMPLES_VEML6070_PROGNAME ?= veml6070$(EXEEXT) diff --git a/examples/watchdog/Makefile b/examples/watchdog/Makefile index 1d96c8def..764171d1f 100644 --- a/examples/watchdog/Makefile +++ b/examples/watchdog/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Watchdog Timer Example. -ASRCS = -CSRCS = MAINSRC = watchdog_main.c CONFIG_XYZ_PROGNAME ?= watchdog$(EXEEXT) diff --git a/examples/webserver/Makefile b/examples/webserver/Makefile index c6f0e1d00..a73e3c7c2 100644 --- a/examples/webserver/Makefile +++ b/examples/webserver/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # uIP very tiny web server example diff --git a/examples/wget/Makefile b/examples/wget/Makefile index 9fc13d0e9..85bae21f5 100644 --- a/examples/wget/Makefile +++ b/examples/wget/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # wget webclient example -ASRCS = -CSRCS = MAINSRC = wget_main.c APPNAME = wget diff --git a/examples/wgetjson/Makefile b/examples/wgetjson/Makefile index 8b6c379e8..69c50384b 100644 --- a/examples/wgetjson/Makefile +++ b/examples/wgetjson/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hello, World! Example -ASRCS = -CSRCS = MAINSRC = wgetjson_main.c CONFIG_XYZ_PROGNAME ?= wgetjson$(EXEEXT) diff --git a/examples/xbc_test/Makefile b/examples/xbc_test/Makefile index 15b15c047..306fa8e19 100644 --- a/examples/xbc_test/Makefile +++ b/examples/xbc_test/Makefile @@ -36,7 +36,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # XBox controller driver test built-in application info @@ -49,8 +49,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_XBC_TEST_STACKSIZE) # Xbc_Test, World! Example -ASRCS = -CSRCS = MAINSRC = xbc_test_main.c CONFIG_EXAMPLES_XBC_TEST_PROGNAME ?= xbc_test$(EXEEXT) diff --git a/examples/xmlrpc/Makefile b/examples/xmlrpc/Makefile index 3b4a5d4d1..c3e862f0e 100644 --- a/examples/xmlrpc/Makefile +++ b/examples/xmlrpc/Makefile @@ -36,7 +36,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # XML RPC built-in application info @@ -44,7 +44,6 @@ APPNAME = xmlrpc PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ASRCS = CSRCS = calls.c MAINSRC = xmlrpc_main.c diff --git a/examples/zerocross/Makefile b/examples/zerocross/Makefile index 64425fc26..2b93de150 100644 --- a/examples/zerocross/Makefile +++ b/examples/zerocross/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Zero Cross Example -ASRCS = -CSRCS = MAINSRC = zerocross_main.c CONFIG_EXAMPLES_ZEROCROSS_PROGNAME ?= zerocross$(EXEEXT) diff --git a/fsutils/flash_eraseall/Makefile b/fsutils/flash_eraseall/Makefile index 970982ca9..693b6dab3 100644 --- a/fsutils/flash_eraseall/Makefile +++ b/fsutils/flash_eraseall/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Password file access library -CSRCS = ifeq ($(CONFIG_FSUTILS_FLASH_ERASEALL),y) CSRCS += flash_eraseall.c endif diff --git a/fsutils/inifile/Makefile b/fsutils/inifile/Makefile index ae61334f4..ee55e6dae 100644 --- a/fsutils/inifile/Makefile +++ b/fsutils/inifile/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # I2C tool CSRCS = inifile.c diff --git a/fsutils/inih/Makefile b/fsutils/inih/Makefile index 36088ab3b..51ddbfaf4 100644 --- a/fsutils/inih/Makefile +++ b/fsutils/inih/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs WGET = wget CP = cp -R diff --git a/fsutils/mkfatfs/Makefile b/fsutils/mkfatfs/Makefile index ff9eefcf7..1f5e5a1d3 100644 --- a/fsutils/mkfatfs/Makefile +++ b/fsutils/mkfatfs/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # mkfatfs utility diff --git a/fsutils/mksmartfs/Makefile b/fsutils/mksmartfs/Makefile index 99d000af9..aec927f90 100644 --- a/fsutils/mksmartfs/Makefile +++ b/fsutils/mksmartfs/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # SmartFS file utility diff --git a/fsutils/passwd/Makefile b/fsutils/passwd/Makefile index 2588795fc..259bdd426 100644 --- a/fsutils/passwd/Makefile +++ b/fsutils/passwd/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Password file access library -CSRCS = - ifeq ($(CONFIG_FSUTILS_PASSWD),y) ifeq ($(CONFIG_FS_READABLE),y) CSRCS += passwd_verify.c passwd_find.c passwd_encrypt.c diff --git a/gpsutils/minmea/Makefile b/gpsutils/minmea/Makefile index 404b631f7..db71a2b21 100644 --- a/gpsutils/minmea/Makefile +++ b/gpsutils/minmea/Makefile @@ -33,11 +33,11 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NSH Library -CSRCS = minmea.c +CSRCS = minmea.c CFLAGS += -std=c99 include $(APPDIR)/Application.mk diff --git a/graphics/ft80x/Makefile b/graphics/ft80x/Makefile index 4d0e950c8..45a37b8d8 100644 --- a/graphics/ft80x/Makefile +++ b/graphics/ft80x/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FTDI/BridgeTek FT80x library CSRCS = ft80x_dl.c ft80x_ramg.c ft80x_ramdl.c ft80x_ramcmd.c diff --git a/graphics/littlevgl/Makefile b/graphics/littlevgl/Makefile index 2a53f8010..f4ab87c23 100644 --- a/graphics/littlevgl/Makefile +++ b/graphics/littlevgl/Makefile @@ -33,14 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LVGL graphic library -ASRCS = -CSRCS = -VPATH = - LVGL_DIR = . # LVGL Libraries diff --git a/graphics/nxglyphs/Makefile b/graphics/nxglyphs/Makefile index 6b0950db1..dee6b7108 100644 --- a/graphics/nxglyphs/Makefile +++ b/graphics/nxglyphs/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs ifeq ($(CONFIG_NXWIDGETS),y) # Glyphs used by NxWidgets diff --git a/graphics/nxwidgets/Makefile b/graphics/nxwidgets/Makefile index 75b0c8363..6df3bbe96 100644 --- a/graphics/nxwidgets/Makefile +++ b/graphics/nxwidgets/Makefile @@ -33,10 +33,7 @@ # ################################################################################# --include $(TOPDIR)/Make.defs - -ASRCS = -CSRCS = +include $(TOPDIR)/Make.defs # Infrastructure diff --git a/graphics/nxwidgets/UnitTests/CButton/Makefile b/graphics/nxwidgets/UnitTests/CButton/Makefile index 905fd190c..20632d353 100644 --- a/graphics/nxwidgets/UnitTests/CButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CButton/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CButton unit test -ASRCS = -CSRCS = CXXSRCS = cbuttontest.cxx MAINSRC = cbutton_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile index 33c16f216..0a6b8ebcd 100644 --- a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile +++ b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CButtonArray unit test -ASRCS = -CSRCS = CXXSRCS = cbuttonarraytest.cxx MAINSRC = cbuttonarray_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile index d2e3bc421..be4a51a55 100644 --- a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CCheckBox unit test -ASRCS = -CSRCS = CXXSRCS = ccheckboxtest.cxx MAINSRC = ccheckbox_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile index c59a06fa9..fe423c32d 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CGlyphButton unit test -ASRCS = -CSRCS = CXXSRCS = cglyphbuttontest.cxx MAINSRC = cglyphbutton_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile index 3f95b417d..92191a6f9 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CGlyphSliderHorizontal unit test -ASRCS = -CSRCS = CXXSRCS = cglyphsliderhorizontaltest.cxx MAINSRC = cglyphsliderhorizontal_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CImage/Makefile b/graphics/nxwidgets/UnitTests/CImage/Makefile index 7ec32d756..0f1fb2aa7 100644 --- a/graphics/nxwidgets/UnitTests/CImage/Makefile +++ b/graphics/nxwidgets/UnitTests/CImage/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CImage unit test -ASRCS = -CSRCS = CXXSRCS = cimagetest.cxx MAINSRC = cimage_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CKeypad/Makefile b/graphics/nxwidgets/UnitTests/CKeypad/Makefile index 6b52fec41..688152faf 100644 --- a/graphics/nxwidgets/UnitTests/CKeypad/Makefile +++ b/graphics/nxwidgets/UnitTests/CKeypad/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CKeyPad unit test -ASRCS = -CSRCS = CXXSRCS = ckeypadtest.cxx MAINSRC = ckeypad_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CLabel/Makefile b/graphics/nxwidgets/UnitTests/CLabel/Makefile index 2a4395192..60799cb20 100644 --- a/graphics/nxwidgets/UnitTests/CLabel/Makefile +++ b/graphics/nxwidgets/UnitTests/CLabel/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CLabel unit test -ASRCS = -CSRCS = CXXSRCS = clabeltest.cxx MAINSRC = clabel_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile index e4d0e2b43..91b7b9f0e 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CLatchButton unit test -ASRCS = -CSRCS = CXXSRCS = clatchbuttontest.cxx MAINSRC = clatchbutton_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile index 78f05624b..158cc0877 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CLatchButtonArray unit test -ASRCS = -CSRCS = CXXSRCS = clatchbuttonarraytest.cxx MAINSRC = clatchbuttonarray_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CListBox/Makefile b/graphics/nxwidgets/UnitTests/CListBox/Makefile index 68be3dedb..60a486a60 100644 --- a/graphics/nxwidgets/UnitTests/CListBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CListBox/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CListBox unit test -ASRCS = -CSRCS = CXXSRCS = clistboxtest.cxx MAINSRC = clistbox_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile index 758405dbf..c41fa80a5 100644 --- a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile +++ b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CProgressBar unit test -ASRCS = -CSRCS = CXXSRCS = cprogressbartest.cxx MAINSRC = cprogressbar_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile index 017e1185b..29c9c7467 100644 --- a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CRadioButton unit test -ASRCS = -CSRCS = CXXSRCS = cradiobuttontest.cxx MAINSRC = cradiobutton_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile index 1a81080ad..31888a2dc 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CScrollbarHorizontal unit test -ASRCS = -CSRCS = CXXSRCS = cscrollbarhorizontaltest.cxx MAINSRC = cscrollbarhorizontal_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile index 991f01d50..3c9255480 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CScrollbarVertical unit test -ASRCS = -CSRCS = CXXSRCS = cscrollbarverticaltest.cxx MAINSRC = cscrollbarvertical_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile index 242aeac5a..7f3475d34 100644 --- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CSliderHorizontal unit test -ASRCS = -CSRCS = CXXSRCS = csliderhorizontaltest.cxx MAINSRC = csliderhorizontal_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile index a49740ec8..5d394b66e 100644 --- a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CSliderVertical unit test -ASRCS = -CSRCS = CXXSRCS = csliderverticaltest.cxx MAINSRC = cslidervertical_main.cxx diff --git a/graphics/nxwidgets/UnitTests/CTextBox/Makefile b/graphics/nxwidgets/UnitTests/CTextBox/Makefile index 40b3effea..fccae305e 100644 --- a/graphics/nxwidgets/UnitTests/CTextBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CTextBox/Makefile @@ -33,12 +33,10 @@ # ################################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CTextBox unit test -ASRCS = -CSRCS = CXXSRCS = ctextboxtest.cxx MAINSRC = ctextbox_main.cxx diff --git a/graphics/nxwm/Makefile b/graphics/nxwm/Makefile index 2cd8ccf2a..9528956c7 100644 --- a/graphics/nxwm/Makefile +++ b/graphics/nxwm/Makefile @@ -33,10 +33,7 @@ # ################################################################################# --include $(TOPDIR)/Make.defs - -ASRCS = -CSRCS = +include $(TOPDIR)/Make.defs # Window Manager diff --git a/graphics/pdcurs34/Makefile b/graphics/pdcurs34/Makefile index 2f8bdc8c9..ffa210e29 100644 --- a/graphics/pdcurs34/Makefile +++ b/graphics/pdcurs34/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # pdcurses Text User Interface include pdcurses/Make.defs diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile index 018aefcd9..bd31fcd48 100644 --- a/graphics/screenshot/Makefile +++ b/graphics/screenshot/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # TIFF Screenshot utility diff --git a/graphics/slcd/Makefile b/graphics/slcd/Makefile index 5283adb22..47d688ec4 100644 --- a/graphics/slcd/Makefile +++ b/graphics/slcd/Makefile @@ -33,14 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs --include $(APPDIR)/Make.defs +include $(TOPDIR)/Make.defs # SLcd -ASRCS = -CSRCS = -CXXSRCS = cslcd.cxx slcd_mapping.cxx slcd_trapezoids.cxx -MAINSRC = +CXXSRCS = cslcd.cxx slcd_mapping.cxx slcd_trapezoids.cxx include $(APPDIR)/Application.mk diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 057d3d076..8a45a5956 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttX TIFF Creation Tool CSRCS = tiff_addstrip.c tiff_finalize.c tiff_initialize.c tiff_utils.c diff --git a/graphics/traveler/Makefile b/graphics/traveler/Makefile index c5ed560a2..9d613236c 100644 --- a/graphics/traveler/Makefile +++ b/graphics/traveler/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Directories @@ -58,7 +58,7 @@ CSRCS += trv_rayprune.c trv_rayrend.c trv_texturefile.c trv_trigtbl.c CSRCS += trv_world.c ifeq ($(CONFIG_GRAPHICS_TRAVELER_ROMFSDEMO),y) -CSRCS += trv_romfs.c +CSRCS += trv_romfs.c endif MAINSRC = trv_main.c diff --git a/graphics/traveler/tools/Makefile.host b/graphics/traveler/tools/Makefile.host index 9e435e80e..554534399 100644 --- a/graphics/traveler/tools/Makefile.host +++ b/graphics/traveler/tools/Makefile.host @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs -include ${TOPDIR}/tools/Config.mk +include $(TOPDIR)/Make.defs # Directories diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile index 6e3c5aa60..789a6845c 100644 --- a/graphics/twm4nx/Makefile +++ b/graphics/twm4nx/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs --include $(APPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Add path to cursor images to CXXFLAGS @@ -52,8 +51,6 @@ STACKSIZE = $(CONFIG_TWM4NX_STACKSIZE) # Twm4Nx -ASRCS = -CSRCS = CXXSRCS = twm4nx_main.cxx CXXSRCS += cbackground.cxx cfonts.cxx ciconmgr.cxx ciconwidget.cxx CXXSRCS += cmenus.cxx cmainmenu.cxx diff --git a/import/Make.defs b/import/Make.defs index 5de69bd75..27095a3a8 100644 --- a/import/Make.defs +++ b/import/Make.defs @@ -33,7 +33,6 @@ # ############################################################################ -include $(TOPDIR)/.config include $(TOPDIR)/scripts/Make.defs # Control build verbosity diff --git a/import/Makefile b/import/Makefile index 4cb23c6e6..63eb4bec1 100644 --- a/import/Makefile +++ b/import/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Sub-directories from the NuttX export package diff --git a/industry/abnt_codi/Makefile b/industry/abnt_codi/Makefile index 5b8a3d16e..8b3a42bfc 100644 --- a/industry/abnt_codi/Makefile +++ b/industry/abnt_codi/Makefile @@ -33,11 +33,11 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NSH Library -CSRCS = abnt_codi.c +CSRCS = abnt_codi.c CFLAGS += -std=c99 include $(APPDIR)/Application.mk diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile index b92cad3f6..2282d609d 100644 --- a/interpreters/bas/Makefile +++ b/interpreters/bas/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # BAS Library diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile index f0fb94723..b823c3fd5 100644 --- a/interpreters/ficl/Makefile +++ b/interpreters/ficl/Makefile @@ -35,7 +35,7 @@ BUILDDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'} --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Tools @@ -45,8 +45,6 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BU # Source Files -ASRCS = -CXXSRCS = CSRCS = nuttx.c -include Make.srcs diff --git a/interpreters/minibasic/Makefile b/interpreters/minibasic/Makefile index 5e4478024..e5b4583fd 100644 --- a/interpreters/minibasic/Makefile +++ b/interpreters/minibasic/Makefile @@ -33,11 +33,11 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Mini Basic Library -CSRCS = basic.c +CSRCS = basic.c MAINSRC = script.c diff --git a/modbus/Makefile b/modbus/Makefile index 01c174117..85e47d9fa 100644 --- a/modbus/Makefile +++ b/modbus/Makefile @@ -33,13 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # FreeModBus Library -ASRCS = -CSRCS = - ifeq ($(CONFIG_MODBUS),y) ifeq ($(CONFIG_MODBUS_SLAVE),y) diff --git a/netutils/chat/Makefile b/netutils/chat/Makefile index 2e3f88438..c58ff5cdd 100644 --- a/netutils/chat/Makefile +++ b/netutils/chat/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CSRCS = chat.c diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile index 50b80fc12..1dfa4c67a 100644 --- a/netutils/cjson/Makefile +++ b/netutils/cjson/Makefile @@ -35,7 +35,7 @@ # Standard includes --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Set up build configuration and environment diff --git a/netutils/codecs/Makefile b/netutils/codecs/Makefile index 5b3b35f62..551b5b685 100644 --- a/netutils/codecs/Makefile +++ b/netutils/codecs/Makefile @@ -33,8 +33,8 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs -CSRCS = urldecode.c base64.c md5.c +CSRCS = urldecode.c base64.c md5.c include $(APPDIR)/Application.mk diff --git a/netutils/dhcpc/Makefile b/netutils/dhcpc/Makefile index 42f052762..675e0687b 100644 --- a/netutils/dhcpc/Makefile +++ b/netutils/dhcpc/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # DHCP Client Library -CSRCS = ifeq ($(CONFIG_NET_UDP),y) -CSRCS += dhcpc.c +CSRCS = dhcpc.c endif include $(APPDIR)/Application.mk diff --git a/netutils/dhcpd/Makefile b/netutils/dhcpd/Makefile index 804ffd3f9..d88e8d2b7 100644 --- a/netutils/dhcpd/Makefile +++ b/netutils/dhcpd/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # DHCP Daemn Library -CSRCS = ifeq ($(CONFIG_NET_UDP),y) -CSRCS += dhcpd.c +CSRCS = dhcpd.c endif include $(APPDIR)/Application.mk diff --git a/netutils/discover/Makefile b/netutils/discover/Makefile index df6b2e5f3..ccc7a5ba9 100644 --- a/netutils/discover/Makefile +++ b/netutils/discover/Makefile @@ -36,12 +36,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Telnet daemon ifeq ($(CONFIG_NET_UDP),y) -CSRCS += discover.c +CSRCS = discover.c endif include $(APPDIR)/Application.mk diff --git a/netutils/esp8266/Makefile b/netutils/esp8266/Makefile index 46a5c2b00..2a61fd5e4 100644 --- a/netutils/esp8266/Makefile +++ b/netutils/esp8266/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ESP8266 Library CSRCS = esp8266.c diff --git a/netutils/ftpc/Makefile b/netutils/ftpc/Makefile index 75906b5fd..90cf3334f 100644 --- a/netutils/ftpc/Makefile +++ b/netutils/ftpc/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # DHCP Daemn Library -CSRCS = - ifeq ($(CONFIG_NET_TCP),y) # FTP connection management CSRCS += ftpc_connect.c ftpc_disconnect.c diff --git a/netutils/ftpd/Makefile b/netutils/ftpd/Makefile index be91ba8cb..a9e116303 100644 --- a/netutils/ftpd/Makefile +++ b/netutils/ftpd/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Telnet daemon -CSRCS = ifeq ($(CONFIG_NET_TCP),y) -CSRCS += ftpd.c +CSRCS = ftpd.c endif include $(APPDIR)/Application.mk diff --git a/netutils/libcurl4nx/Makefile b/netutils/libcurl4nx/Makefile index 363d38f46..a508e5474 100644 --- a/netutils/libcurl4nx/Makefile +++ b/netutils/libcurl4nx/Makefile @@ -33,14 +33,14 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Web client library -CSRCS = curl4nx_easy_init.c curl4nx_easy_cleanup.c \ - curl4nx_easy_reset.c curl4nx_easy_duphandle.c \ - curl4nx_easy_escape.c curl4nx_easy_unescape.c \ - curl4nx_easy_setopt.c curl4nx_easy_perform.c \ - curl4nx_easy_getinfo.c +CSRCS = curl4nx_easy_init.c curl4nx_easy_cleanup.c \ + curl4nx_easy_reset.c curl4nx_easy_duphandle.c \ + curl4nx_easy_escape.c curl4nx_easy_unescape.c \ + curl4nx_easy_setopt.c curl4nx_easy_perform.c \ + curl4nx_easy_getinfo.c include $(APPDIR)/Application.mk diff --git a/netutils/netinit/Makefile b/netutils/netinit/Makefile index 876b83254..7735e7e98 100644 --- a/netutils/netinit/Makefile +++ b/netutils/netinit/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CSRCS = netinit.c diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile index 446b0703a..3bf9e3ea8 100644 --- a/netutils/netlib/Makefile +++ b/netutils/netlib/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Network Library diff --git a/netutils/ntpclient/Makefile b/netutils/ntpclient/Makefile index 4d0e5dfe4..72055a7f7 100644 --- a/netutils/ntpclient/Makefile +++ b/netutils/ntpclient/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NTP client daemon Library -CSRCS = ifeq ($(CONFIG_NET_UDP),y) -CSRCS += ntpclient.c +CSRCS = ntpclient.c endif include $(APPDIR)/Application.mk diff --git a/netutils/ping/Makefile b/netutils/ping/Makefile index 6f8482b5f..ac9fd0414 100644 --- a/netutils/ping/Makefile +++ b/netutils/ping/Makefile @@ -33,11 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs - -CSRCS = +include $(TOPDIR)/Make.defs ifeq ($(CONFIG_NETUTILS_PING),y) CSRCS += icmp_ping.c diff --git a/netutils/pppd/Makefile b/netutils/pppd/Makefile index fd7d2f291..1c939481b 100644 --- a/netutils/pppd/Makefile +++ b/netutils/pppd/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CSRCS = pppd.c ppp.c ahdlc.c lcp.c ipcp.c ifeq ($(CONFIG_NETUTILS_PPPD_PAP),y) diff --git a/netutils/smtp/Makefile b/netutils/smtp/Makefile index 3918e7547..2a3119f25 100644 --- a/netutils/smtp/Makefile +++ b/netutils/smtp/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # SMTP Library -CSRCS = ifeq ($(CONFIG_NET_TCP),y) -CSRCS += smtp.c +CSRCS = smtp.c endif include $(APPDIR)/Application.mk diff --git a/netutils/telnetc/Makefile b/netutils/telnetc/Makefile index 731b0eee2..b22709d4f 100644 --- a/netutils/telnetc/Makefile +++ b/netutils/telnetc/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Telnet daemon -CSRCS = ifeq ($(CONFIG_NET_TCP),y) -CSRCS += telnetc.c +CSRCS = telnetc.c endif include $(APPDIR)/Application.mk diff --git a/netutils/telnetd/Makefile b/netutils/telnetd/Makefile index 7f67eaa49..93aaf8a46 100644 --- a/netutils/telnetd/Makefile +++ b/netutils/telnetd/Makefile @@ -33,13 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Telnet daemon -CSRCS = ifeq ($(CONFIG_NET_TCP),y) -CSRCS += telnetd_daemon.c +CSRCS = telnetd_daemon.c endif include $(APPDIR)/Application.mk diff --git a/netutils/tftpc/Makefile b/netutils/tftpc/Makefile index 6f2d65403..cf5c20904 100644 --- a/netutils/tftpc/Makefile +++ b/netutils/tftpc/Makefile @@ -33,12 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # TFTP Client Library ifeq ($(CONFIG_NET_UDP),y) -CSRCS += tftpc_get.c tftpc_put.c tftpc_packets.c +CSRCS = tftpc_get.c tftpc_put.c tftpc_packets.c endif include $(APPDIR)/Application.mk diff --git a/netutils/thttpd/Makefile b/netutils/thttpd/Makefile index 5ac46f9d5..950925174 100644 --- a/netutils/thttpd/Makefile +++ b/netutils/thttpd/Makefile @@ -33,10 +33,9 @@ # ############################################################################# --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # THTTPD Library -CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c diff --git a/netutils/thttpd/cgi-src/Makefile b/netutils/thttpd/cgi-src/Makefile index bb8e36457..16e0c3734 100644 --- a/netutils/thttpd/cgi-src/Makefile +++ b/netutils/thttpd/cgi-src/Makefile @@ -33,8 +33,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w diff --git a/netutils/webclient/Makefile b/netutils/webclient/Makefile index b6e1a33ba..38af45db9 100644 --- a/netutils/webclient/Makefile +++ b/netutils/webclient/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Web client library diff --git a/netutils/webserver/Makefile b/netutils/webserver/Makefile index acdbd62ca..00ca847f7 100644 --- a/netutils/webserver/Makefile +++ b/netutils/webserver/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Web server library -CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += httpd.c httpd_cgi.c ifeq ($(CONFIG_NETUTILS_HTTPD_SENDFILE),y) diff --git a/netutils/xmlrpc/Makefile b/netutils/xmlrpc/Makefile index 990facc1b..3a2af5368 100644 --- a/netutils/xmlrpc/Makefile +++ b/netutils/xmlrpc/Makefile @@ -36,11 +36,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs -CSRCS = ifeq ($(CONFIG_NET_TCP),y) -CSRCS += xmlparser.c response.c +CSRCS = xmlparser.c response.c endif include $(APPDIR)/Application.mk diff --git a/nshlib/Makefile b/nshlib/Makefile index b66ecd4a2..d31065085 100644 --- a/nshlib/Makefile +++ b/nshlib/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NSH Library diff --git a/platform/Makefile b/platform/Makefile index 5bf9ce73a..70c42edd4 100644 --- a/platform/Makefile +++ b/platform/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_ARCH_BOARD ?= dummy diff --git a/platform/bin/Makefile b/platform/bin/Makefile index 3f8b21f12..79114a040 100644 --- a/platform/bin/Makefile +++ b/platform/bin/Makefile @@ -33,7 +33,7 @@ # ########################################################################### --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs all: .PHONY: clean distclean diff --git a/system/cdcacm/Makefile b/system/cdcacm/Makefile index 8ef8bbf5c..b4c2dbd1b 100644 --- a/system/cdcacm/Makefile +++ b/system/cdcacm/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # USB CDC/ACM serial mass storage add-on diff --git a/system/cfgdata/Makefile b/system/cfgdata/Makefile index 735b02e59..9983b1f3b 100644 --- a/system/cfgdata/Makefile +++ b/system/cfgdata/Makefile @@ -38,7 +38,7 @@ # TODO, this makefile should run make under the app dirs, instead of # sourcing the Make.defs! --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # config Application # TODO: appname can be automatically extracted from the directory name diff --git a/system/cle/Makefile b/system/cle/Makefile index 135d4ea13..6558e26e1 100644 --- a/system/cle/Makefile +++ b/system/cle/Makefile @@ -33,9 +33,9 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # EMACS-like Command Line Editor (CLE) -CSRCS = cle.c +CSRCS = cle.c include $(APPDIR)/Application.mk diff --git a/system/composite/Makefile b/system/composite/Makefile index 7c22e5517..1bec72226 100644 --- a/system/composite/Makefile +++ b/system/composite/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # USB device mass storage add-on diff --git a/system/critmon/Makefile b/system/critmon/Makefile index b4ddff66e..206884a7f 100644 --- a/system/critmon/Makefile +++ b/system/critmon/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Stack Monitor Application diff --git a/system/cu/Makefile b/system/cu/Makefile index 329fe05e2..d6dfc68a9 100644 --- a/system/cu/Makefile +++ b/system/cu/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs MAINSRC = cu_main.c diff --git a/system/dhcpc/Makefile b/system/dhcpc/Makefile index 439acc42f..05a72efaf 100644 --- a/system/dhcpc/Makefile +++ b/system/dhcpc/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # DHCPC address renewal built-in application info diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile index 3ef4537b7..08db7ef34 100644 --- a/system/embedlog/Makefile +++ b/system/embedlog/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs WGET = wget CP = cp -R diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile index 9d430b4ea..5106f336e 100644 --- a/system/flash_eraseall/Makefile +++ b/system/flash_eraseall/Makefile @@ -38,7 +38,7 @@ # TODO, this makefile should run make under the app dirs, instead of # sourcing the Make.defs! --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # flash_eraseall Application # TODO: appname can be automatically extracted from the directory name diff --git a/system/hex2bin/Makefile b/system/hex2bin/Makefile index 2f4b54159..2b0405bad 100644 --- a/system/hex2bin/Makefile +++ b/system/hex2bin/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Hex2bin utility diff --git a/system/hexed/Makefile b/system/hexed/Makefile index 5ca0fc70e..991da7c0b 100644 --- a/system/hexed/Makefile +++ b/system/hexed/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # hexed Application diff --git a/system/i2c/Makefile b/system/i2c/Makefile index af9b8a142..519bf4b1d 100644 --- a/system/i2c/Makefile +++ b/system/i2c/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # I2C tool CSRCS = i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_set.c i2c_verf.c diff --git a/system/lm75/Makefile b/system/lm75/Makefile index ecee3e6e8..9a2e379ef 100644 --- a/system/lm75/Makefile +++ b/system/lm75/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LM-75 Temperature Sensor Application diff --git a/system/lzf/Makefile b/system/lzf/Makefile index 10429d537..4ecf1a738 100644 --- a/system/lzf/Makefile +++ b/system/lzf/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LZF built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_SYSTEM_LZF_STACKSIZE) # LZF compression example tool -ASRCS = -CSRCS = MAINSRC = lzf_main.c CONFIG_SYSTEM_LZF_PROGNAME ?= lzf$(EXEEXT) diff --git a/system/mdio/Makefile b/system/mdio/Makefile index 3c2669a32..d533fdc91 100644 --- a/system/mdio/Makefile +++ b/system/mdio/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # MDIO tool built-in application info diff --git a/system/netdb/Makefile b/system/netdb/Makefile index b56019d34..bed7169ff 100644 --- a/system/netdb/Makefile +++ b/system/netdb/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # netdb Application diff --git a/system/nsh/Makefile b/system/nsh/Makefile index baa921f1a..66297af04 100644 --- a/system/nsh/Makefile +++ b/system/nsh/Makefile @@ -33,14 +33,10 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NuttShell (NSH) Example -ASRCS = -CSRCS = MAINSRC = nsh_main.c CONFIG_SYSTEM_NSH_PROGNAME ?= nsh$(EXEEXT) diff --git a/system/ntpc/Makefile b/system/ntpc/Makefile index 33dd00e42..2e43b89ca 100644 --- a/system/ntpc/Makefile +++ b/system/ntpc/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NTPC address renewal built-in application info diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile index ca0b06f11..1d8beb0e9 100644 --- a/system/nxplayer/Makefile +++ b/system/nxplayer/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NxPlayer Library diff --git a/system/nxrecorder/Makefile b/system/nxrecorder/Makefile index 7eb2bb058..5578edfa4 100644 --- a/system/nxrecorder/Makefile +++ b/system/nxrecorder/Makefile @@ -32,7 +32,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NxRecorder Library diff --git a/system/ping/Makefile b/system/ping/Makefile index 0bbf0bcf8..955cf4c86 100644 --- a/system/ping/Makefile +++ b/system/ping/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ICMP ping command diff --git a/system/ping6/Makefile b/system/ping6/Makefile index 3d2d83eb5..c7d4a22a1 100644 --- a/system/ping6/Makefile +++ b/system/ping6/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ICMP ping6 command diff --git a/system/popen/Makefile b/system/popen/Makefile index cbc7549ce..4b185d674 100644 --- a/system/popen/Makefile +++ b/system/popen/Makefile @@ -33,13 +33,10 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs +include $(TOPDIR)/Make.defs # popen()/pclose functions -ASRCS = CSRCS = popen.c include $(APPDIR)/Application.mk diff --git a/system/prun/Makefile b/system/prun/Makefile index 79bdac686..d930bcbb8 100644 --- a/system/prun/Makefile +++ b/system/prun/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Pascal P-Code interpreter / Virtual machine diff --git a/system/psmq/Makefile b/system/psmq/Makefile index 18871072b..7326d61d4 100644 --- a/system/psmq/Makefile +++ b/system/psmq/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs WGET = wget CP = cp -R diff --git a/system/ramtest/Makefile b/system/ramtest/Makefile index 77a18e26e..ba024ecc3 100644 --- a/system/ramtest/Makefile +++ b/system/ramtest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # RAM test diff --git a/system/readline/Makefile b/system/readline/Makefile index 053539433..824b4aa96 100644 --- a/system/readline/Makefile +++ b/system/readline/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # The Readline Library diff --git a/system/sched_note/Makefile b/system/sched_note/Makefile index 174bec01f..3d3c60b4a 100644 --- a/system/sched_note/Makefile +++ b/system/sched_note/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # LED driver test built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_SYSTEM_NOTE_STACKSIZE) # LED driver test -ASRCS = -CSRCS = MAINSRC = note_main.c CONFIG_SYSTEM_NOTE_PROGNAME ?= note$(EXEEXT) diff --git a/system/setlogmask/Makefile b/system/setlogmask/Makefile index 7608ca72b..885cea50f 100644 --- a/system/setlogmask/Makefile +++ b/system/setlogmask/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # setlogmask command diff --git a/system/spi/Makefile b/system/spi/Makefile index 5c37756fe..c1dd9c425 100644 --- a/system/spi/Makefile +++ b/system/spi/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # SPI tool diff --git a/system/stackmonitor/Makefile b/system/stackmonitor/Makefile index 24a49963e..845e30878 100644 --- a/system/stackmonitor/Makefile +++ b/system/stackmonitor/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Stack Monitor Application diff --git a/system/sudoku/Makefile b/system/sudoku/Makefile index b0bacf122..83cbd2f8a 100644 --- a/system/sudoku/Makefile +++ b/system/sudoku/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Sudoku Application diff --git a/system/system/Makefile b/system/system/Makefile index 70e07de15..53e01855c 100644 --- a/system/system/Makefile +++ b/system/system/Makefile @@ -33,11 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # system command -ASRCS = CSRCS = system.c include $(APPDIR)/Application.mk diff --git a/system/taskset/Makefile b/system/taskset/Makefile index 11887a9b8..4af8fb829 100644 --- a/system/taskset/Makefile +++ b/system/taskset/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # taskset command diff --git a/system/tee/Makefile b/system/tee/Makefile index 919a3ec3d..f3cfc91a8 100644 --- a/system/tee/Makefile +++ b/system/tee/Makefile @@ -35,7 +35,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # tee command diff --git a/system/telnet/Makefile b/system/telnet/Makefile index cb4a2d1f5..a86228761 100644 --- a/system/telnet/Makefile +++ b/system/telnet/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs ifneq ($(CONFIG_SYSTEM_TELNET_CHATD),) diff --git a/system/termcurses/Makefile b/system/termcurses/Makefile index 1aae6823f..ed2d61cb6 100644 --- a/system/termcurses/Makefile +++ b/system/termcurses/Makefile @@ -33,10 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Termcurses terminal emulation library -CSRCS = termcurses.c tcurses_vt100.c +CSRCS = termcurses.c tcurses_vt100.c include $(APPDIR)/Application.mk diff --git a/system/ubloxmodem/Makefile b/system/ubloxmodem/Makefile index ccc592b97..0a54e83a6 100644 --- a/system/ubloxmodem/Makefile +++ b/system/ubloxmodem/Makefile @@ -33,12 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # u-blox modem tool -ASRCS = -CSRCS = MAINSRC = ubloxmodem_main.c CONFIG_XYZ_PROGNAME ?= ubloxmodem$(EXEEXT) diff --git a/system/usbmsc/Makefile b/system/usbmsc/Makefile index efed20b50..faae440fb 100644 --- a/system/usbmsc/Makefile +++ b/system/usbmsc/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE ?= 768 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY ?= SCHED_PRIORITY_DEFAULT diff --git a/system/vi/Makefile b/system/vi/Makefile index 13d01b076..63113ed17 100644 --- a/system/vi/Makefile +++ b/system/vi/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # VI-Workalike Editor diff --git a/system/zmodem/Makefile b/system/zmodem/Makefile index 53308e08d..b9cfb0c15 100644 --- a/system/zmodem/Makefile +++ b/system/zmodem/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_SYSTEM_SZPROGNAME ?= sz$(EXEEXT) PROGNAME = $(CONFIG_SYSTEM_SZPROGNAME) diff --git a/system/zmodem/Makefile.host b/system/zmodem/Makefile.host index 3b0d88a74..dd0cc1318 100644 --- a/system/zmodem/Makefile.host +++ b/system/zmodem/Makefile.host @@ -49,8 +49,7 @@ # ############################################################################ --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs NUTTXINC = $(TOPDIR)/include diff --git a/testing/cxxtest/Makefile b/testing/cxxtest/Makefile index 815d417ed..3bead4c44 100644 --- a/testing/cxxtest/Makefile +++ b/testing/cxxtest/Makefile @@ -33,13 +33,10 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # CXX test program -ASRCS = -CSRCS = -CXXSRCS = MAINSRC = cxxtest_main.cxx CONFIG_XYZ_PROGNAME ?= cxxtest$(EXEEXT) diff --git a/testing/fstest/Makefile b/testing/fstest/Makefile index 77573b883..1399864bc 100644 --- a/testing/fstest/Makefile +++ b/testing/fstest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Generic file system stress test application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_TESTING_FSTEST_STACKSIZE) # Generic file system stress test -ASRCS = -CSRCS = MAINSRC = fstest_main.c CONFIG_TESTING_FSTEST_PROGNAME ?= hello$(EXEEXT) diff --git a/testing/nxffs/Makefile b/testing/nxffs/Makefile index 1e3a59153..8267bbcad 100644 --- a/testing/nxffs/Makefile +++ b/testing/nxffs/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # NXFFS file system example APPNAME = nxffs -ASRCS = -CSRCS = MAINSRC = nxffs_main.c CONFIG_XYZ_PROGNAME ?= nxffs$(EXEEXT) diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile index 4ad4cee16..ebaa92897 100644 --- a/testing/ostest/Makefile +++ b/testing/ostest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # ostest built-in application info @@ -43,7 +43,6 @@ STACKSIZE = 2048 # NuttX OS Test -ASRCS = CSRCS = dev_null.c restart.c sigprocmask.c sighand.c signest.c MAINSRC = ostest_main.c diff --git a/testing/scanftest/Makefile b/testing/scanftest/Makefile index f8247401f..01e7c2952 100644 --- a/testing/scanftest/Makefile +++ b/testing/scanftest/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # scanf() test built-in application info @@ -47,8 +47,6 @@ STACKSIZE = $(CONFIG_TESTING_SCANFTEST_STACKSIZE) # scanf test files -ASRCS = -CSRCS = MAINSRC = scanftest_main.c CONFIG_TESTING_SCANFTEST_PROGNAME ?= scanftest$(EXEEXT) diff --git a/testing/smart/Makefile b/testing/smart/Makefile index cad3ad726..8f06f6a9d 100644 --- a/testing/smart/Makefile +++ b/testing/smart/Makefile @@ -33,14 +33,12 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # SMART file system stress test APPNAME = smart -ASRCS = -CSRCS = MAINSRC = smart_main.c CONFIG_XYZ_PROGNAME ?= smart$(EXEEXT) diff --git a/testing/smart_test/Makefile b/testing/smart_test/Makefile index 75e50c69c..be4c07921 100644 --- a/testing/smart_test/Makefile +++ b/testing/smart_test/Makefile @@ -34,7 +34,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -46,8 +46,6 @@ APPNAME = smart_test PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 4096 -ASRCS = -CSRCS = MAINSRC = smart_test.c CONFIG_XYZ_PROGNAME ?= smart_test$(EXEEXT) diff --git a/testing/smp/Makefile b/testing/smp/Makefile index 15223cf9f..b7cb9016e 100644 --- a/testing/smp/Makefile +++ b/testing/smp/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # SMP built-in application info @@ -46,8 +46,6 @@ STACKSIZE = $(CONFIG_TESTING_SMP_STACKSIZE) # SMP Example -ASRCS = -CSRCS = MAINSRC = smp_main.c CONFIG_TESTING_SMP_PROGNAME ?= smp$(EXEEXT) diff --git a/testing/unity/Makefile b/testing/unity/Makefile index b71d03297..6aae7aa33 100644 --- a/testing/unity/Makefile +++ b/testing/unity/Makefile @@ -35,7 +35,7 @@ # Standard includes --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Set up build configuration and environment diff --git a/wireless/bluetooth/btsak/Makefile b/wireless/bluetooth/btsak/Makefile index 123975587..acda1ea0a 100644 --- a/wireless/bluetooth/btsak/Makefile +++ b/wireless/bluetooth/btsak/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # Bluetooth SAK (swiss army knife ) diff --git a/wireless/gs2200m/Makefile b/wireless/gs2200m/Makefile index cab8c57f4..67b06cb87 100644 --- a/wireless/gs2200m/Makefile +++ b/wireless/gs2200m/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # gs2200m command diff --git a/wireless/ieee802154/i8sak/Makefile b/wireless/ieee802154/i8sak/Makefile index dd860cfb8..070829b6c 100644 --- a/wireless/ieee802154/i8sak/Makefile +++ b/wireless/ieee802154/i8sak/Makefile @@ -34,7 +34,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # IEEE 802.15.4 SAK (swiss army knife ) diff --git a/wireless/ieee802154/i8shark/Makefile b/wireless/ieee802154/i8shark/Makefile index 6bf6a6883..bcd8be221 100644 --- a/wireless/ieee802154/i8shark/Makefile +++ b/wireless/ieee802154/i8shark/Makefile @@ -33,10 +33,8 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs -ASRCS = -CSRCS = MAINSRC = i8shark_main.c CONFIG_XYZ_PROGNAME ?= i8shark$(EXEEXT) diff --git a/wireless/ieee802154/libmac/Makefile b/wireless/ieee802154/libmac/Makefile index 845cdf7c2..63c6e1c2d 100644 --- a/wireless/ieee802154/libmac/Makefile +++ b/wireless/ieee802154/libmac/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # libmac source files diff --git a/wireless/ieee802154/libutils/Makefile b/wireless/ieee802154/libutils/Makefile index ab59574c0..3ac7baff0 100644 --- a/wireless/ieee802154/libutils/Makefile +++ b/wireless/ieee802154/libutils/Makefile @@ -33,7 +33,7 @@ # ############################################################################ --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # libutils source files CSRCS += ieee802154_addrtostr.c diff --git a/wireless/iwpan/Makefile b/wireless/iwpan/Makefile index 19452db8a..5dcb2df4a 100644 --- a/wireless/iwpan/Makefile +++ b/wireless/iwpan/Makefile @@ -37,7 +37,7 @@ # TODO, this makefile should run make under the app dirs, instead of # sourcing the Make.defs! --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs CONFIG_WIRELESS_IWPAN_PRIORITY ?= 100 CONFIG_WIRELESS_IWPAN_STACKSIZE ?= 2048 diff --git a/wireless/iwpan/src/Make.defs b/wireless/iwpan/src/Make.defs index fde94d3d4..62542cbe0 100644 --- a/wireless/iwpan/src/Make.defs +++ b/wireless/iwpan/src/Make.defs @@ -36,7 +36,6 @@ ifneq ($(CONFIG_WIRELESS_IWPAN),) -CSRCS = MAINSRC = iwpan.c DEPPATH += --dep-path src diff --git a/wireless/wapi/Makefile b/wireless/wapi/Makefile index 36bd84db6..d816902f6 100644 --- a/wireless/wapi/Makefile +++ b/wireless/wapi/Makefile @@ -36,7 +36,7 @@ # TODO, this makefile should run make under the app dirs, instead of # sourcing the Make.defs! --include $(TOPDIR)/Make.defs +include $(TOPDIR)/Make.defs # IEEE802.11 Wapi Application