diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-23 07:41:00 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-23 07:41:00 -0600 |
| commit | d61269128b30220efab74363c76b5985804009e3 (patch) | |
| tree | 2b960cceb744d88ba017dd56111fc802b036e5bc | |
| parent | ec7c99825707d953257f7aae940924dc6c713d73 (diff) | |
| download | nuttx-d61269128b30220efab74363c76b5985804009e3.tar.gz nuttx-d61269128b30220efab74363c76b5985804009e3.tar.bz2 nuttx-d61269128b30220efab74363c76b5985804009e3.zip | |
arch/arm/src/Makefile: dependency directory list is now computed from the VPATH. From Richard Cochran
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 1549a87b4..95c0cfbb8 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6484,7 +6484,7 @@ ostest/Make.defs: Add a configuration option to select the -m32 compiler option when building for a 32-bit target on a native 64-bit compiler (2014-1-18). - * include/ctype.h: Typo in macro name: iscntrol, not iscontrol (2104-1-17) + * include/ctype.h: Typo in macro name: iscntrl, not iscontrol (2104-1-17) * libc/unistd/lib_getopt.c: If there are no arguments (argc == 1), then getopt() make like the optind variable in an undefined state (2014-1-20). * configs/olimex-stm32-p107: Failes to build is SPI3 for UEXT is not @@ -6498,3 +6498,5 @@ * tools/Config.mk: 'cypath' must be called if we are using a Windows native toolchain with the Cygwin 'make' to convert paths to proper Windows paths. From Richard Cochran (2014-1-23). + * /arch/arm/src/Makefile: dependency directory list is not computed + from the VPATH. From Richard Cochran (2014-1-23). diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 2819474e0..c4fcb4c6c 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -150,7 +150,9 @@ endif LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" GCC_LIBDIR := ${shell dirname $(LIBGCC)} -VPATH = chip:common:$(ARCH_SUBDIR) +VPATH += chip +VPATH += common +VPATH += $(ARCH_SUBDIR) all: $(HEAD_OBJ) $(BIN) @@ -202,7 +204,7 @@ endif ifeq ($(BOARDMAKE),y) $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif - $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ + $(Q) $(MKDEP) $(patsubst %,--dep-path %,$(subst :, ,$(VPATH))) \ "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ |