diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-03 14:26:05 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-03 14:26:05 +0000 |
commit | 139456d3cb1a8c7be9e48d765eda23b15d8c8bad (patch) | |
tree | beda77a9181d9e274d066c6c466423325b8d8f8a /nuttx/Makefile | |
parent | f5d629b65b9588ddae1333f06aa392083c284949 (diff) | |
download | px4-nuttx-139456d3cb1a8c7be9e48d765eda23b15d8c8bad.tar.gz px4-nuttx-139456d3cb1a8c7be9e48d765eda23b15d8c8bad.tar.bz2 px4-nuttx-139456d3cb1a8c7be9e48d765eda23b15d8c8bad.zip |
New LIS331DL driver and VSN updates from Uros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3457 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
-rw-r--r-- | nuttx/Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index dea43c109..1ecc8563e 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -153,7 +153,6 @@ CLEANDIRS += net # be created). If the pass1 obect is an archive, it could go anywhere. ifeq ($(CONFIG_BUILD_2PASS),y) -#EXTRA_OBJS = $(TOPDIR)/$(CONFIG_PASS1_BUILDIR)/$(CONFIG_PASS1_OBJECT) EXTRA_OBJS += $(CONFIG_PASS1_OBJECT) endif @@ -168,11 +167,12 @@ NUTTXLIBS = sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEX lib/liblib$(LIBEXT) USERLIBS = -# Add libraries for syscall support. +# Add libraries for syscall support. The C library will be needed by +# both the kernel- and user-space builds. ifeq ($(CONFIG_NUTTX_KERNEL),y) NUTTXLIBS += syscall/libstubs$(LIBEXT) -USERLIBS += syscall/libproxies$(LIBEXT) +USERLIBS += syscall/libproxies$(LIBEXT) lib/liblib$(LIBEXT) endif # Add libraries for network support. CXX, CXXFLAGS, and COMPILEXX must @@ -334,19 +334,17 @@ syscall/libproxies$(LIBEXT): context @$(MAKE) -C syscall TOPDIR="$(TOPDIR)" libproxies$(LIBEXT) # If the 2 pass build option is selected, then this pass1 target is -# configured be build a extra link object. This is assumed to be an -# incremental (relative) link object, but could be a static library -# (archive); some modification to this Makefile would be required if -# CONFIG_PASS1_OBJECT is an archive. +# configured to built before the pass2 target. This pass1 target may, as an +# example, build an extra link object (CONFIG_PASS1_OBJECT) which may be an +# incremental (relative) link object, but could be a static library (archive); +# some modification to this Makefile would be required if CONFIG_PASS1_OBJECT +# is an archive. Exactly what is performed during pass1 or what it generates +# is unknown to this makefule unless CONFIG_PASS1_OBJECT is defined. pass1deps: context depend $(USERLIBS) pass1: pass1deps ifeq ($(CONFIG_BUILD_2PASS),y) - @if [ -z "$(CONFIG_PASS1_OBJECT)" ]; then \ - echo "ERROR: CONFIG_PASS1_OBJECT not defined"; \ - exit 1; \ - fi @if [ -z "$(CONFIG_PASS1_BUILDIR)" ]; then \ echo "ERROR: CONFIG_PASS1_BUILDIR not defined"; \ exit 1; \ @@ -359,7 +357,7 @@ ifeq ($(CONFIG_BUILD_2PASS),y) echo "ERROR: No Makefile in CONFIG_PASS1_BUILDIR"; \ exit 1; \ fi - @$(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(NUTTXLIBS)" USERLIBS="$(USERLIBS)" "$(ARCH_SRC)/$(CONFIG_PASS1_OBJECT)" + @$(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(NUTTXLIBS)" USERLIBS="$(USERLIBS)" "$(CONFIG_PASS1_TARGET)" endif pass2deps: context depend $(NUTTXLIBS) |