Prep for 6.0 release
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3408 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
a30185e702
commit
35ff9cc3dd
6
Makefile
6
Makefile
@ -52,8 +52,6 @@ SUBDIRS = nuttapp nshlib netutils examples vsn
|
|||||||
BUILTIN_APPS_BUILT = nuttapp/.built_always
|
BUILTIN_APPS_BUILT = nuttapp/.built_always
|
||||||
BUILTIN_APPS_DIR = nuttapp
|
BUILTIN_APPS_DIR = nuttapp
|
||||||
|
|
||||||
ifeq ($(CONFIG_BUILTIN_APPS),y)
|
|
||||||
|
|
||||||
# CONFIGURED_APPS is the list of all configured built-in directories/built action
|
# CONFIGURED_APPS is the list of all configured built-in directories/built action
|
||||||
# It is created by the configured appconfig file (a copy of which appears in this
|
# It is created by the configured appconfig file (a copy of which appears in this
|
||||||
# directoy as .config)
|
# directoy as .config)
|
||||||
@ -86,10 +84,6 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_AVAILABLE,$(BUILTIN))))
|
|||||||
$(foreach APP, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_APP,$(APP))))
|
$(foreach APP, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_APP,$(APP))))
|
||||||
$(foreach BUILT, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_BUILT,$(BUILT))))
|
$(foreach BUILT, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_BUILT,$(BUILT))))
|
||||||
|
|
||||||
# end of application list
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
# The final build target
|
# The final build target
|
||||||
|
|
||||||
BIN = libapps$(LIBEXT)
|
BIN = libapps$(LIBEXT)
|
||||||
|
@ -51,11 +51,6 @@
|
|||||||
* Pre-processor Definitions
|
* Pre-processor Definitions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef CONFIG_BUILTIN_APPS
|
|
||||||
# warning "This example requires CONFIG_BUILTIN_APPS..."
|
|
||||||
# warning " You must have an appconfig file in your config directory to use this example"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private Types
|
* Private Types
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user