diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-28 08:40:03 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-28 08:40:03 -0600 |
| commit | 6155c555e636176d884500ae699a6233dd010188 (patch) | |
| tree | 79e5925cb3bfa3e7b8761986a3f3dd0e1abcfc78 /nuttx/Makefile.unix | |
| parent | e734551bfdb6e406fba2678e5252fca78115256f (diff) | |
| download | px4-nuttx-6155c555e636176d884500ae699a6233dd010188.tar.gz px4-nuttx-6155c555e636176d884500ae699a6233dd010188.tar.bz2 px4-nuttx-6155c555e636176d884500ae699a6233dd010188.zip | |
Move the NX components out of libc and into its own library, libnx
Diffstat (limited to 'nuttx/Makefile.unix')
| -rw-r--r-- | nuttx/Makefile.unix | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index 142b84ca1..273024f6d 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -134,10 +134,10 @@ endif endif ifeq ($(CONFIG_NX),y) -NONFSDIRS += graphics -CONTEXTDIRS += graphics +NONFSDIRS += graphics libnx +CONTEXTDIRS += graphics libnx else -OTHERDIRS += graphics +OTHERDIRS += graphics libnx endif ifeq ($(CONFIG_AUDIO),y) @@ -256,6 +256,12 @@ endif ifeq ($(CONFIG_NX),y) NUTTXLIBS += lib/libgraphics$(LIBEXT) +ifeq ($(CONFIG_NUTTX_KERNEL),y) +NUTTXLIBS += lib/libknx$(LIBEXT) +USERLIBS += lib/libunx$(LIBEXT) +else +NUTTXLIBS += lib/libnx$(LIBEXT) +endif endif # Add libraries for the audio sub-system @@ -471,6 +477,12 @@ libc/libkc$(LIBEXT): context lib/libkc$(LIBEXT): libc/libkc$(LIBEXT) $(Q) install libc/libkc$(LIBEXT) lib/libkc$(LIBEXT) +libnx/libknx$(LIBEXT): context + $(Q) $(MAKE) -C libnx TOPDIR="$(TOPDIR)" libknx$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib/libknx$(LIBEXT): libnx/libknx$(LIBEXT) + $(Q) install libnx/libknx$(LIBEXT) lib/libknx$(LIBEXT) + mm/libkmm$(LIBEXT): context $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libkmm$(LIBEXT) EXTRADEFINES=$(KDEFINE) @@ -540,6 +552,12 @@ libc/libuc$(LIBEXT): context lib/libuc$(LIBEXT): libc/libuc$(LIBEXT) $(Q) install libc/libuc$(LIBEXT) lib/libuc$(LIBEXT) +libnx/libunx$(LIBEXT): context + $(Q) $(MAKE) -C libnx TOPDIR="$(TOPDIR)" libunx$(LIBEXT) + +lib/libunx$(LIBEXT): libnx/libunx$(LIBEXT) + $(Q) install libnx/libunx$(LIBEXT) lib/libunx$(LIBEXT) + mm/libumm$(LIBEXT): context $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libumm$(LIBEXT) @@ -579,6 +597,12 @@ libc/libc$(LIBEXT): context lib/libc$(LIBEXT): libc/libc$(LIBEXT) $(Q) install libc/libc$(LIBEXT) lib/libc$(LIBEXT) +libnx/libnx$(LIBEXT): context + $(Q) $(MAKE) -C libnx TOPDIR="$(TOPDIR)" libnx$(LIBEXT) + +lib/libnx$(LIBEXT): libnx/libnx$(LIBEXT) + $(Q) install libnx/libnx$(LIBEXT) lib/libnx$(LIBEXT) + mm/libmm$(LIBEXT): context $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) |