diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-24 00:28:50 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-24 00:28:50 +0000 |
commit | 1e10d8d0d3733432f69d86948645896295864d42 (patch) | |
tree | a678b793c7a420cedb58e9f99ca4b39fea502fd6 /apps/vsn | |
parent | fe55a3d3121630eda2b910bac6b051a38e3b5f60 (diff) | |
download | px4-nuttx-1e10d8d0d3733432f69d86948645896295864d42.tar.gz px4-nuttx-1e10d8d0d3733432f69d86948645896295864d42.tar.bz2 px4-nuttx-1e10d8d0d3733432f69d86948645896295864d42.zip |
apps/ initialization now occurs during the earlier context build phase
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3412 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/vsn')
-rw-r--r-- | apps/vsn/Makefile | 10 | ||||
-rw-r--r-- | apps/vsn/free/Makefile | 18 | ||||
-rw-r--r-- | apps/vsn/hello/Makefile | 18 | ||||
-rw-r--r-- | apps/vsn/poweroff/Makefile | 18 | ||||
-rw-r--r-- | apps/vsn/ramtron/Makefile | 18 | ||||
-rw-r--r-- | apps/vsn/sdcard/Makefile | 18 |
6 files changed, 74 insertions, 26 deletions
diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile index b3fed59c2..a2dab4dbc 100644 --- a/apps/vsn/Makefile +++ b/apps/vsn/Makefile @@ -40,10 +40,18 @@ SUBDIRS = free hello poweroff ramtron sdcard all: nothing -.PHONY: nothing depend clean distclean +.PHONY: nothing context depend clean distclean nothing: +.context: + @for dir in $(SUBDIRS) ; do \ + $(MAKE) -C $$dir context TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + done + @touch $@ + +context: .context + depend: @for dir in $(SUBDIRS) ; do \ $(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ diff --git a/apps/vsn/free/Makefile b/apps/vsn/free/Makefile index 01545d06d..cac2b1d10 100644 --- a/apps/vsn/free/Makefile +++ b/apps/vsn/free/Makefile @@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path . VPATH = all: .built +.PHONY: .built context depend clean distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -85,13 +86,20 @@ $(BIN): $(OBJS) .built: $(BIN) -.depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep +# Register application + +.context: $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) @touch $@ -# Register application +context: .context + +# Create dependencies + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + depend: .depend clean: @@ -99,6 +107,6 @@ clean: $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + @rm -f .context Make.dep .depend -include Make.dep diff --git a/apps/vsn/hello/Makefile b/apps/vsn/hello/Makefile index 45f60e9bd..23aba200c 100644 --- a/apps/vsn/hello/Makefile +++ b/apps/vsn/hello/Makefile @@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path . VPATH = all: .built +.PHONY: .built context depend clean distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -85,13 +86,20 @@ $(BIN): $(OBJS) .built: $(BIN) -.depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep +# Register application + +.context: $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) @touch $@ -# Register application +context: .context + +# Create dependencies + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + depend: .depend clean: @@ -99,6 +107,6 @@ clean: $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + @rm -f .context Make.dep .depend -include Make.dep diff --git a/apps/vsn/poweroff/Makefile b/apps/vsn/poweroff/Makefile index d4fc2ed00..5337fd45b 100644 --- a/apps/vsn/poweroff/Makefile +++ b/apps/vsn/poweroff/Makefile @@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path . VPATH = all: .built +.PHONY: .built context depend clean distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -85,13 +86,20 @@ $(BIN): $(OBJS) .built: $(BIN) -.depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep +# Register application + +.context: $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) @touch $@ -# Register application +context: .context + +# Create dependencies + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + depend: .depend clean: @@ -99,6 +107,6 @@ clean: $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + @rm -f .context Make.dep .depend -include Make.dep diff --git a/apps/vsn/ramtron/Makefile b/apps/vsn/ramtron/Makefile index c9aeae651..440af1ceb 100644 --- a/apps/vsn/ramtron/Makefile +++ b/apps/vsn/ramtron/Makefile @@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path . VPATH = all: .built +.PHONY: .built context depend clean distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -85,13 +86,20 @@ $(BIN): $(OBJS) .built: $(BIN) -.depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep +# Register application + +.context: $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) @touch $@ -# Register application +context: .context + +# Create dependencies + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + depend: .depend clean: @@ -99,6 +107,6 @@ clean: $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + @rm -f .context Make.dep .depend -include Make.dep diff --git a/apps/vsn/sdcard/Makefile b/apps/vsn/sdcard/Makefile index ea0f51f35..3a7454140 100644 --- a/apps/vsn/sdcard/Makefile +++ b/apps/vsn/sdcard/Makefile @@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path . VPATH = all: .built +.PHONY: .built context depend clean distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -85,13 +86,20 @@ $(BIN): $(OBJS) .built: $(BIN) -.depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep +# Register application + +.context: $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) @touch $@ -# Register application +context: .context + +# Create dependencies + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + depend: .depend clean: @@ -99,6 +107,6 @@ clean: $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + @rm -f .context Make.dep .depend -include Make.dep |