diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 13:52:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 13:52:31 +0000 |
| commit | 448e07b4c109e5281e3d7cfe5239f07e4e2a0b01 (patch) | |
| tree | 4810930700e4d926fadb43e9472bd1d971e1e3e6 /nuttx/arch/sim/src | |
| parent | ece26b562c3da7c148c842794e3a6d941fe1c05b (diff) | |
| download | px4-nuttx-448e07b4c109e5281e3d7cfe5239f07e4e2a0b01.tar.gz px4-nuttx-448e07b4c109e5281e3d7cfe5239f07e4e2a0b01.tar.bz2 px4-nuttx-448e07b4c109e5281e3d7cfe5239f07e4e2a0b01.zip | |
arch/../src/Makefiles now use only libraries in lib/
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5333 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim/src')
| -rw-r--r-- | nuttx/arch/sim/src/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 1e4d08736..3719465b3 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -40,11 +40,11 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = up_setjmp.S AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_initialize.c up_idle.c up_interruptcontext.c \ - up_initialstate.c up_createstack.c up_usestack.c \ - up_releasestack.c up_unblocktask.c up_blocktask.c \ - up_releasepending.c up_reprioritizertr.c \ - up_exit.c up_schedulesigaction.c up_allocateheap.c \ - up_devconsole.c + up_initialstate.c up_createstack.c up_usestack.c \ + up_releasestack.c up_unblocktask.c up_blocktask.c \ + up_releasepending.c up_reprioritizertr.c \ + up_exit.c up_schedulesigaction.c up_allocateheap.c \ + up_devconsole.c HOSTSRCS = up_stdio.c up_hostusleep.c ifeq ($(CONFIG_NX_LCDDRIVER),y) @@ -126,9 +126,10 @@ endif # Determine which NuttX libraries will need to be linked in # Most are provided by LINKLIBS on the MAKE command line -LINKLIBS = -LDPATHS = $(addprefix -L$(TOPDIR)/,$(dir $(LINKLIBS))) -LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS)))) +LINKLIBS ?= +LIBPATHS += -L"(TOPDIR)/lib" +LIBPATHS += -L"$(BOARDDIR)" +LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) # Add the board-specific library and directory |