diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-20 20:32:33 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-20 20:32:33 +0000 |
| commit | 78dd0de872d9bef518f3ef395b4913197e1b2077 (patch) | |
| tree | 0af928d900e8e43c520f6b06248eb84177b6a56e /nuttx/Makefile | |
| parent | 93c4e0321431ad4164eb37c26c532d187d0aa1ab (diff) | |
| download | px4-nuttx-78dd0de872d9bef518f3ef395b4913197e1b2077.tar.gz px4-nuttx-78dd0de872d9bef518f3ef395b4913197e1b2077.tar.bz2 px4-nuttx-78dd0de872d9bef518f3ef395b4913197e1b2077.zip | |
Several webserver bugs fixed
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@391 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index 0f8704a80..bac6e7399 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -60,11 +60,17 @@ endif # MAKEDIRS are the directories in which we will build targets CLEANDIRS = $(NONFSDIRS) $(FSDIRS) +MAKEDIRS = $(NONFSDIRS) ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) -MAKEDIRS = $(NONFSDIRS) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +MAKEDIRS += fs +endif +ifeq ($(CONFIG_NET),y) +MAKEDIRS += drivers +endif else -MAKEDIRS = $(NONFSDIRS) $(FSDIRS) +MAKEDIRS += $(FSDIRS) endif # LINKLIBS is the list of NuttX libraries that is passed to the @@ -75,12 +81,19 @@ endif LINKLIBS = sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \ lib/liblib$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT) -ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) -LINKLIBS += fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) +ifeq ($(CONFIG_NET),y) +LINKLIBS += net/libnet$(LIBEXT) netutils/libnetutils$(LIBEXT) endif +ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +LINKLIBS += fs/libfs$(LIBEXT) +endif ifeq ($(CONFIG_NET),y) -LINKLIBS += net/libnet$(LIBEXT) netutils/libnetutils$(LIBEXT) +LINKLIBS += drivers/libdrivers$(LIBEXT) +endif +else +LINKLIBS += fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) endif # This is the name of the final target |