diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-18 13:52:21 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-18 13:52:21 +0000 |
commit | 0ee20483b0ff4150e09338821ef7e5a62eab2d47 (patch) | |
tree | 15c6069e637ef2c122e4a48db9e52dd4dde10bdd /nuttx/drivers/Makefile | |
parent | 00a3fe0fd33b150ac10dd3e576fc4893abb61893 (diff) | |
download | px4-nuttx-0ee20483b0ff4150e09338821ef7e5a62eab2d47.tar.gz px4-nuttx-0ee20483b0ff4150e09338821ef7e5a62eab2d47.tar.bz2 px4-nuttx-0ee20483b0ff4150e09338821ef7e5a62eab2d47.zip |
Move some drivers to separate subdirectories
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2156 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/Makefile')
-rw-r--r-- | nuttx/drivers/Makefile | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile index ad9dcaa0f..9155aedc1 100644 --- a/nuttx/drivers/Makefile +++ b/nuttx/drivers/Makefile @@ -39,12 +39,24 @@ ifeq ($(WINTOOL),y) INCDIROPT = -w endif +ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) +include serial/Make.defs +ROOTDEPPATH = --dep-path . +SERIALDEPPATH = --dep-path serial +endif + ifeq ($(CONFIG_NET),y) include net/Make.defs ROOTDEPPATH = --dep-path . NETDEPPATH = --dep-path net endif +ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) +include pipes/Make.defs +ROOTDEPPATH = --dep-path . +PIPEDEPPATH = --dep-path pipes +endif + ifeq ($(CONFIG_USBDEV),y) include usbdev/Make.defs ROOTDEPPATH = --dep-path . @@ -66,18 +78,17 @@ CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/driv endif endif -ASRCS = $(NET_ASRCS) $(USBDEV_ASRCS) $(MMCSD_ASRCS) $(BCH_ASRCS) +ASRCS = $(SERIAL_ASRCS) $(NET_ASRCS) $(PIPE_ASRCS) $(USBDEV_ASRCS) $(MMCSD_ASRCS) $(BCH_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) -CSRCS += dev_null.c dev_zero.c pipe.c fifo.c pipe_common.c \ - loop.c serial.c serialirq.c lowconsole.c can.c +CSRCS += dev_null.c dev_zero.c loop.c can.c ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) CSRCS += ramdisk.c endif endif -CSRCS += $(NET_CSRCS) $(USBDEV_CSRCS) $(MMCSD_CSRCS) $(BCH_CSRCS) +CSRCS += $(SERIAL_CSRCS) $(NET_CSRCS) $(PIPE_CSRCS) $(USBDEV_CSRCS) $(MMCSD_CSRCS) $(BCH_CSRCS) COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) @@ -85,7 +96,7 @@ OBJS = $(AOBJS) $(COBJS) BIN = libdrivers$(LIBEXT) -VPATH = net:usbdev:mmcsd:bch +VPATH = serial:net:pipes:usbdev:mmcsd:bch all: $(BIN) @@ -101,7 +112,7 @@ $(BIN): $(OBJS) done ; ) .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(NETDEPPATH) $(USBDEVDEPPATH) $(MMCSDDEPPATH) $(BCHDEPPATH) \ + @$(MKDEP) $(ROOTDEPPATH) $(SERIALDEPPATH) $(NETDEPPATH) $(PIPEDEPPATH)$(USBDEVDEPPATH) $(MMCSDDEPPATH) $(BCHDEPPATH) \ $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ |