You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/19 16:29:45 UTC

[incubator-nuttx-apps] 02/02: example: Remove all APPNAME from Makefile

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit 0c84e22aaf71815fb2c4a53ddcec6e07b34a057d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 19 22:41:22 2020 +0800

    example: Remove all APPNAME from Makefile
    
    which doesn't use anymore
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 examples/audio_rttl/Makefile | 12 +++---------
 examples/bmi160/Makefile     |  8 +-------
 examples/charger/Makefile    |  8 +-------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/examples/audio_rttl/Makefile b/examples/audio_rttl/Makefile
index ad7b415..2192290 100644
--- a/examples/audio_rttl/Makefile
+++ b/examples/audio_rttl/Makefile
@@ -40,12 +40,9 @@ include $(APPDIR)/Make.defs
 
 # Audio application info
 
-CONFIG_EXAMPLES_AUDIO_BEEP_PRIORITY ?= SCHED_PRIORITY_DEFAULT
-CONFIG_EXAMPLES_AUDIO_BEEP_STACKSIZE ?= 2048
-
-APPNAME   = audio_rttl
-PRIORITY  = $(CONFIG_EXAMPLES_AUDIO_BEEP_PRIORITY)
-STACKSIZE = $(CONFIG_EXAMPLES_AUDIO_BEEP_STACKSIZE)
+PROGNAME = $(CONFIG_EXAMPLES_AUDIO_SOUND_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_AUDIO_SOUND_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_AUDIO_SOUND_STACKSIZE)
 
 # Audio Example
 
@@ -65,7 +62,4 @@ endif
 
 CXXFLAGS += -D_POSIX
 
-CONFIG_EXAMPLES_AUDIO_BEEP_PROGNAME ?= audio_rttl$(EXEEXT)
-PROGNAME = $(CONFIG_EXAMPLES_AUDIO_BEEP_PROGNAME)
-
 include $(APPDIR)/Application.mk
diff --git a/examples/bmi160/Makefile b/examples/bmi160/Makefile
index 367bfc7..6bda693 100644
--- a/examples/bmi160/Makefile
+++ b/examples/bmi160/Makefile
@@ -38,10 +38,7 @@
 
 # sixaxis built-in application info
 
-CONFIG_EXAMPLES_SIXAXIS_PRIORITY ?= SCHED_PRIORITY_DEFAULT
-CONFIG_EXAMPLES_SIXAXIS_STACKSIZE ?= 2048
-
-APPNAME = bmi160
+PROGNAME = $(CONFIG_EXAMPLES_SIXAXIS_PROGNAME)
 PRIORITY = $(CONFIG_EXAMPLES_SIXAXIS_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_SIXAXIS_STACKSIZE)
 
@@ -51,7 +48,4 @@ ASRCS =
 CSRCS =
 MAINSRC = sixaxis_main.c
 
-CONFIG_EXAMPLES_SIXAXIS_PROGNAME ?= sixaxis$(EXEEXT)
-PROGNAME = $(CONFIG_EXAMPLES_SIXAXIS_PROGNAME)
-
 include $(APPDIR)/Application.mk
diff --git a/examples/charger/Makefile b/examples/charger/Makefile
index 8c3a3ca..31e9fba 100644
--- a/examples/charger/Makefile
+++ b/examples/charger/Makefile
@@ -2,10 +2,7 @@
 -include $(TOPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs
 
-CONFIG_EXAMPLES_CHARGER_PRIORITY ?= SCHED_PRIORITY_DEFAULT
-CONFIG_EXAMPLES_CHARGER_STACKSIZE ?= 2048
-
-APPNAME = charger
+PROGNAME = $(CONFIG_EXAMPLES_CHARGER_PROGNAME)
 PRIORITY = $(CONFIG_EXAMPLES_CHARGER_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_CHARGER_STACKSIZE)
 
@@ -13,7 +10,4 @@ ASRCS =
 CSRCS =
 MAINSRC = charger_main.c
 
-CONFIG_EXAMPLES_CHARGER_PROGNAME ?= charger$(EXEEXT)
-PROGNAME = $(CONFIG_EXAMPLES_CHARGER_PROGNAME)
-
 include $(APPDIR)/Application.mk