diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
| commit | 63e8e1bed383170be61d722348be7efcf1a33ec3 (patch) | |
| tree | 121d4fdf55df9d292c0d1d3971b2c5252cf39eaa /nuttx/arch/arm/src/Makefile | |
| parent | a42dcee79d5090c8df3a3a04cd1cf2b6d0347575 (diff) | |
| download | px4-firmware-63e8e1bed383170be61d722348be7efcf1a33ec3.tar.gz px4-firmware-63e8e1bed383170be61d722348be7efcf1a33ec3.tar.bz2 px4-firmware-63e8e1bed383170be61d722348be7efcf1a33ec3.zip | |
Correct some issues with last check-in; ez80 still does not build
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/Makefile')
| -rw-r--r-- | nuttx/arch/arm/src/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 1f470a25d..6a1dcd5d1 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -78,32 +78,32 @@ EXTRA_LIBPATHS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" GCC_LIBDIR := ${shell dirname $(LIBGCC)} VPATH = chip:common:$(ARCH_SUBDIR) @@ -150,24 +150,24 @@ endif # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend |