diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-05-30 11:14:06 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-05-30 11:14:06 -0600 |
| commit | 8e0b8379fe3a21a23a8514787c31a6508d800449 (patch) | |
| tree | b2aaee9d40fb63b83a7c42aea19fad2d75ad3ee5 | |
| parent | ab7516bd7c444d34950354e9ee207aeeb478be59 (diff) | |
| download | nuttx-8e0b8379fe3a21a23a8514787c31a6508d800449.tar.gz nuttx-8e0b8379fe3a21a23a8514787c31a6508d800449.tar.bz2 nuttx-8e0b8379fe3a21a23a8514787c31a6508d800449.zip | |
Move arp-related files from net/uip to net/arp
| -rw-r--r-- | nuttx/net/Makefile | 12 | ||||
| -rw-r--r-- | nuttx/net/arp/uip_arp.c (renamed from nuttx/net/uip/uip_arp.c) | 2 | ||||
| -rw-r--r-- | nuttx/net/arp/uip_arptab.c (renamed from nuttx/net/uip/uip_arptab.c) | 2 | ||||
| -rw-r--r-- | nuttx/net/uip/Make.defs | 13 |
4 files changed, 16 insertions, 13 deletions
diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile index 7c92bb21a..bf88c3ea4 100644 --- a/nuttx/net/Makefile +++ b/nuttx/net/Makefile @@ -44,6 +44,9 @@ SOCK_CSRCS = bind.c connect.c getsockname.c recv.c recvfrom.c socket.c SOCK_CSRCS += sendto.c net_sockets.c net_close.c net_dup.c net_dup2.c SOCK_CSRCS += net_clone.c net_vfcntl.c +VPATH = +DEPPATH = --dep-path . + # TCP/IP support ifeq ($(CONFIG_NET_TCP),y) @@ -99,13 +102,14 @@ ifeq ($(CONFIG_NET_RXAVAIL),y) NETDEV_CSRCS += netdev_rxnotify.c endif +include arp/Make.defs include uip/Make.defs endif -ASRCS = $(SOCK_ASRCS) $(NETDEV_ASRCS) $(UIP_ASRCS) +ASRCS = $(SOCK_ASRCS) $(NETDEV_ASRCS) $(ARP_ASRCS) $(UIP_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = $(SOCK_CSRCS) $(NETDEV_CSRCS) $(UIP_CSRCS) +CSRCS = $(SOCK_CSRCS) $(NETDEV_CSRCS) $(ARP_CSRCS) $(UIP_CSRCS) COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) @@ -113,8 +117,6 @@ OBJS = $(AOBJS) $(COBJS) BIN = libnet$(LIBEXT) -VPATH = uip - all: $(BIN) $(AOBJS): %$(OBJEXT): %.S @@ -128,7 +130,7 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) ifeq ($(CONFIG_NET),y) - $(Q) $(MKDEP) --dep-path . --dep-path uip "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep endif $(Q) touch $@ diff --git a/nuttx/net/uip/uip_arp.c b/nuttx/net/arp/uip_arp.c index 068552084..a58a1560a 100644 --- a/nuttx/net/uip/uip_arp.c +++ b/nuttx/net/arp/uip_arp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_arp.c + * net/arp/uip_arp.c * Implementation of the ARP Address Resolution Protocol. * * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. diff --git a/nuttx/net/uip/uip_arptab.c b/nuttx/net/arp/uip_arptab.c index af68a3bd8..96a0f19b5 100644 --- a/nuttx/net/uip/uip_arptab.c +++ b/nuttx/net/arp/uip_arptab.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_arptab.c + * net/arp/uip_arptab.c * Implementation of the ARP Address Resolution Protocol. * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. diff --git a/nuttx/net/uip/Make.defs b/nuttx/net/uip/Make.defs index 8c81a11c4..382fb2e5d 100644 --- a/nuttx/net/uip/Make.defs +++ b/nuttx/net/uip/Make.defs @@ -49,12 +49,6 @@ ifeq ($(CONFIG_NET_NOINTS),y) UIP_CSRCS += uip_lock.c endif -# ARP supported is not provided for SLIP (Ethernet only) - -ifneq ($(CONFIG_NET_SLIP),y) -UIP_CSRCS += uip_arp.c uip_arptab.c -endif - # IPv6-specific logic ifeq ($(CONFIG_NET_IPv6),y) @@ -111,4 +105,11 @@ UIP_CSRCS += uip_mcastmac.c endif endif + +# Include uip build support + +DEPPATH += --dep-path uip +VPATH += :uip +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)net$(DELIM)uip} + endif |