diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-17 17:53:25 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-17 17:53:25 +0000 |
| commit | 8efbdd8cad0fb23b7d985495b749b94ef1fffb0e (patch) | |
| tree | 44f5d6bc79d45abdc8413d70eb9c573743d3ceb2 | |
| parent | ef079b42cab313dcc8cc383aebbe60299fb1c1f3 (diff) | |
| download | px4-nuttx-8efbdd8cad0fb23b7d985495b749b94ef1fffb0e.tar.gz px4-nuttx-8efbdd8cad0fb23b7d985495b749b94ef1fffb0e.tar.bz2 px4-nuttx-8efbdd8cad0fb23b7d985495b749b94ef1fffb0e.zip | |
Fix race conditions probably caused by multiple, asynchronous make jobs
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2368 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/Makefile | 5 | ||||
| -rw-r--r-- | nuttx/graphics/Makefile | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index eba340467..bf2859aca 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -71,6 +71,7 @@ ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS) FSDIRS = fs drivers binfmt +CONTEXTDIRS = ifeq ($(CONFIG_NET),y) NONFSDIRS += net netutils @@ -78,6 +79,7 @@ endif ifeq ($(CONFIG_NX),y) NONFSDIRS += graphics +CONTEXTDIRS += graphics endif # CLEANDIRS are the directories that will clean in. These are @@ -189,6 +191,9 @@ endif dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip context: check_context include/nuttx/config.h dirlinks + @for dir in $(CONTEXTDIRS) ; do \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" context ; \ + done clean_context: @rm -f include/nuttx/config.h diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile index 22c0e6d7e..ea7580dd5 100644 --- a/nuttx/graphics/Makefile +++ b/nuttx/graphics/Makefile @@ -86,7 +86,7 @@ VPATH = nxglib:nxbe:nxsu:nxtk:nxfonts endif all: mklibgraphics -.PHONY : depend clean distclean mklibgraphics gensources gen1bppsources \ +.PHONY : context depend clean distclean mklibgraphics gensources gen1bppsources \ gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource \ gen32bppsources @@ -138,6 +138,8 @@ mklibgraphics: gensources $(BIN) depend: .depend +context: gensources + clean: @make -C nxglib -f Makefile.sources clean TOPDIR=$(TOPDIR) @make -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR) @@ -150,3 +152,4 @@ distclean: clean @rm -f Make.dep .depend -include Make.dep + |