aboutsummaryrefslogtreecommitdiff
path: root/apps/examples/cdcacm
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-01-17 01:00:46 -0800
committerpx4dev <px4@purgatory.org>2013-01-17 01:00:46 -0800
commit1a532d16dd3a90f20c3668b00ea4f3a86ea32c49 (patch)
treea770db1fe91e5a3c08e4cb03b216ac36c6f7684d /apps/examples/cdcacm
parent7d7c352fb44b718cb96096a624a19b5225e39f92 (diff)
parentcaeef71797019505fd450b1a0ae573ac5e490c6e (diff)
downloadpx4-firmware-1a532d16dd3a90f20c3668b00ea4f3a86ea32c49.tar.gz
px4-firmware-1a532d16dd3a90f20c3668b00ea4f3a86ea32c49.tar.bz2
px4-firmware-1a532d16dd3a90f20c3668b00ea4f3a86ea32c49.zip
Merge NuttX r5527
Diffstat (limited to 'apps/examples/cdcacm')
-rw-r--r--apps/examples/cdcacm/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/examples/cdcacm/Makefile b/apps/examples/cdcacm/Makefile
index e8d03807d..2cf3a107f 100644
--- a/apps/examples/cdcacm/Makefile
+++ b/apps/examples/cdcacm/Makefile
@@ -87,12 +87,17 @@ $(COBJS): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS))
@touch .built
-.context:
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
+
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
- @touch $@
-context: .context
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
+else
+context:
+endif
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep