diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-05 23:57:49 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-05 23:57:49 +0000 |
| commit | cd87146d9b80c85ad070dec888635c2ea6af0a9c (patch) | |
| tree | 3747b5db497b26f2186502c3372499579600be64 /nuttx/Makefile | |
| parent | 038b532c18cf641f2cb6e6d1babeef3333c83ef4 (diff) | |
| download | nuttx-cd87146d9b80c85ad070dec888635c2ea6af0a9c.tar.gz nuttx-cd87146d9b80c85ad070dec888635c2ea6af0a9c.tar.bz2 nuttx-cd87146d9b80c85ad070dec888635c2ea6af0a9c.zip | |
Fix C++ dependencies, cleaning, ..
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4025 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index a298645e1..5b622ab40 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -99,17 +99,28 @@ endif NONFSDIRS = sched $(ARCH_SRC) $(NUTTX_ADDONS) FSDIRS = fs drivers binfmt -NETFSDIRS = fs drivers CONTEXTDIRS = $(APPDIR) USERDIRS = ifeq ($(CONFIG_NUTTX_KERNEL),y) + NONFSDIRS += syscall CONTEXTDIRS += syscall USERDIRS += syscall lib mm $(USER_ADDONS) +ifeq ($(CONFIG_HAVE_CXX),y) +USERDIRS += libxx +endif + else + NONFSDIRS += lib mm OTHERDIRS += syscall $(USER_ADDONS) +ifeq ($(CONFIG_HAVE_CXX),y) +NONFSDIRS += libxx +else +OTHERDIRS += libxx +endif + endif ifeq ($(CONFIG_NX),y) @@ -183,7 +194,7 @@ else NUTTXLIBS += mm/libmm$(LIBEXT) lib/liblib$(LIBEXT) endif -# Add libraries for network support. CXX, CXXFLAGS, and COMPILEXX must +# Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must # be defined in Make.defs for this to work! ifeq ($(CONFIG_HAVE_CXX),y) |