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 | 3ceb882b97a3080425f564a579a9f53a9422ee7c (patch) | |
| tree | 4810930700e4d926fadb43e9472bd1d971e1e3e6 /nuttx/Makefile | |
| parent | 3bf4cd0abd093be0b3f2bac724aa952dc1b1bb60 (diff) | |
| download | px4-firmware-3ceb882b97a3080425f564a579a9f53a9422ee7c.tar.gz px4-firmware-3ceb882b97a3080425f564a579a9f53a9422ee7c.tar.bz2 px4-firmware-3ceb882b97a3080425f564a579a9f53a9422ee7c.zip | |
arch/../src/Makefiles now use only libraries in lib/
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5333 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index bb8ee0a41..7263489c2 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -252,7 +252,7 @@ endif # LINKLIBS derives from NUTTXLIBS and is simply the same list with the subdirectory removed -LINKLIBS = $(patsubst lib/,,$(NUTTXLIBS)) +LINKLIBS = $(patsubst lib/%,%,$(NUTTXLIBS)) # This is the name of the final target (relative to the top level directorty) @@ -566,13 +566,13 @@ ifeq ($(CONFIG_BUILD_2PASS),y) echo "ERROR: No Makefile in CONFIG_PASS1_BUILDIR"; \ exit 1; \ fi - $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(NUTTXLIBS)" USERLIBS="$(USERLIBS)" "$(CONFIG_PASS1_TARGET)" + $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(LINKLIBS)" USERLIBS="$(USERLIBS)" "$(CONFIG_PASS1_TARGET)" endif pass2deps: context pass2dep $(NUTTXLIBS) pass2: pass2deps - $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(NUTTXLIBS)" EXTRADEFINES=$(KDEFINE) $(BIN) + $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(LINKLIBS)" EXTRADEFINES=$(KDEFINE) $(BIN) $(Q) if [ -w /tftpboot ] ; then \ cp -f $(BIN) /tftpboot/$(BIN).${CONFIG_ARCH}; \ fi |