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/configs/ea3131 | |
| 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/configs/ea3131')
| -rw-r--r-- | nuttx/configs/ea3131/locked/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/configs/ea3131/locked/Makefile b/nuttx/configs/ea3131/locked/Makefile index 79fa82610..163bebf25 100644 --- a/nuttx/configs/ea3131/locked/Makefile +++ b/nuttx/configs/ea3131/locked/Makefile @@ -38,42 +38,42 @@ # Board-specific directory, board library, and application library -PASS1_SRCDIR = arch/$(CONFIG_ARCH)/src -PASS1_BOARDDIR = $(PASS1_SRCDIR)/board -PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT) +PASS1_SRCDIR = arch/$(CONFIG_ARCH)/src +PASS1_BOARDDIR = $(PASS1_SRCDIR)/board +PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT) # Where is the application library? ifneq ($(CONFIG_APPS_DIR),) -PASS1_LIBAPPS = $(CONFIG_APPS_DIR)/libapps$(LIBEXT) +PASS1_LIBAPPS = $(CONFIG_APPS_DIR)/libapps$(LIBEXT) else ifneq ($(APPDIR),) -PASS1_LIBAPPS = $(APPDIR)/libapps$(LIBEXT) +PASS1_LIBAPPS = $(APPDIR)/libapps$(LIBEXT) endif endif # Remove the application library (libapps) from the list of libraries. Add # the boad library (liboard) -PASS1_LINKLIBS = $(filter-out $(PASS1_LIBAPPS),$(LINKLIBS)) -PASS1_LINKLIBS += $(PASS1_LIBBOARD) +PASS1_LINKLIBS = $(filter-out $(PASS1_LIBAPPS),$(LINKLIBS)) +PASS1_LINKLIBS += $(PASS1_LIBBOARD) # Get the paths to the libraries and the links script path in format that # is appropriate for the host OS ifeq ($(WINTOOL),y) # Windows-native toolchains - PASS1_LIBPATHS = ${shell for path in $(PASS1_LINKLIBS); do dir=`dirname $(TOPDIR)/$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc}" + PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" + PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc}" else # Linux/Cygwin-native toolchain - PASS1_LIBPATHS = $(addprefix -L$(TOPDIR)/,$(dir $(PASS1_LINKLIBS))) - PASS1_LDSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc + PASS1_LIBPATHS += -L"(TOPDIR)/lib" + PASS1_LDSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc endif -PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT) -PASS1_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(PASS1_LINKLIBS)))) -PASS1_LIBGCC = "${shell $(CC) -print-libgcc-file-name}" +PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT) +PASS1_LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(PASS1_LINKLIBS))) +PASS1_LIBGCC = "${shell $(CC) -print-libgcc-file-name}" # Targets: |