diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-08 22:01:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-08 22:01:50 +0000 |
| commit | f2c129b281fc8fa30eccb9b34df534f954ee3c47 (patch) | |
| tree | a5ff5a1a0415f7fabf66180ccb432243740f4d74 /nuttx/Makefile.unix | |
| parent | 5e160bcf59441ce40088ca089cbeb4461a0b0d6a (diff) | |
| download | px4-nuttx-f2c129b281fc8fa30eccb9b34df534f954ee3c47.tar.gz px4-nuttx-f2c129b281fc8fa30eccb9b34df534f954ee3c47.tar.bz2 px4-nuttx-f2c129b281fc8fa30eccb9b34df534f954ee3c47.zip | |
up_addregion should use kmm_addregion; move garbage kmm*.c file to mm/. for now
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5721 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile.unix')
| -rw-r--r-- | nuttx/Makefile.unix | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index 47debcccf..21d3537bd 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -198,10 +198,10 @@ USERLIBS = # is placed in user space (only). ifeq ($(CONFIG_NUTTX_KERNEL),y) -NUTTXLIBS += lib/libstubs$(LIBEXT) lib/libkc$(LIBEXT) -USERLIBS += lib/libproxies$(LIBEXT) lib/libuc$(LIBEXT) lib/libmm$(LIBEXT) +NUTTXLIBS += lib/libstubs$(LIBEXT) lib/libkc$(LIBEXT) lib/libkmm$(LIBEXT) +USERLIBS += lib/libproxies$(LIBEXT) lib/libuc$(LIBEXT) lib/libumm$(LIBEXT) else -NUTTXLIBS += lib/libmm$(LIBEXT) lib/libc$(LIBEXT) +NUTTXLIBS += lib/libc$(LIBEXT) lib/libmm$(LIBEXT) endif # Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must @@ -457,6 +457,12 @@ libc/libkc$(LIBEXT): context lib/libkc$(LIBEXT): libc/libkc$(LIBEXT) $(Q) install libc/libkc$(LIBEXT) lib/libkc$(LIBEXT) +mm/libkmm$(LIBEXT): context + $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libkmm$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib/libkmm$(LIBEXT): mm/libkmm$(LIBEXT) + $(Q) install mm/libkmm$(LIBEXT) lib/libkmm$(LIBEXT) + sched/libsched$(LIBEXT): context $(Q) $(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT) EXTRADEFINES=$(KDEFINE) @@ -513,18 +519,18 @@ libc/libuc$(LIBEXT): context lib/libuc$(LIBEXT): libc/libuc$(LIBEXT) $(Q) install libc/libuc$(LIBEXT) lib/libuc$(LIBEXT) +mm/libumm$(LIBEXT): context + $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libumm$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib/libumm$(LIBEXT): mm/libumm$(LIBEXT) + $(Q) install mm/libumm$(LIBEXT) lib/libumm$(LIBEXT) + libxx/libcxx$(LIBEXT): context $(Q) $(MAKE) -C libxx TOPDIR="$(TOPDIR)" libcxx$(LIBEXT) lib/libcxx$(LIBEXT): libxx/libcxx$(LIBEXT) $(Q) install libxx/libcxx$(LIBEXT) lib/libcxx$(LIBEXT) -mm/libmm$(LIBEXT): context - $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) EXTRADEFINES=$(KDEFINE) - -lib/libmm$(LIBEXT): mm/libmm$(LIBEXT) - $(Q) install mm/libmm$(LIBEXT) lib/libmm$(LIBEXT) - $(APPDIR)/libapps$(LIBEXT): context $(Q) $(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT) @@ -545,6 +551,12 @@ libc/libc$(LIBEXT): context lib/libc$(LIBEXT): libc/libc$(LIBEXT) $(Q) install libc/libc$(LIBEXT) lib/libc$(LIBEXT) +mm/libmm$(LIBEXT): context + $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib/libmm$(LIBEXT): mm/libmm$(LIBEXT) + $(Q) install mm/libmm$(LIBEXT) lib/libmm$(LIBEXT) + # pass1 and pass2 # # If the 2 pass build option is selected, then this pass1 target is @@ -680,7 +692,6 @@ subdir_clean: fi \ done $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean - $(Q) $(MAKE) -C mm -f Makefile.test TOPDIR="$(TOPDIR)" clean ifeq ($(CONFIG_BUILD_2PASS),y) $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" clean endif |