diff options
-rw-r--r-- | apps/include/netutils/ipmsfilter.h | 2 | ||||
-rw-r--r-- | apps/netutils/netlib/Makefile | 34 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_gethostaddr.c (renamed from apps/netutils/netlib/uip_gethostaddr.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_getifflag.c (renamed from apps/netutils/netlib/uip_getifflag.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_getmacaddr.c (renamed from apps/netutils/netlib/uip_getmacaddr.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_ipmsfilter.c (renamed from apps/netutils/netlib/uip_ipmsfilter.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_listenon.c (renamed from apps/netutils/netlib/uip_listenon.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_parsehttpurl.c (renamed from apps/netutils/netlib/uip_parsehttpurl.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_server.c (renamed from apps/netutils/netlib/uip_server.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_setdraddr.c (renamed from apps/netutils/netlib/uip_setdraddr.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_sethostaddr.c (renamed from apps/netutils/netlib/uip_sethostaddr.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_setifflag.c (renamed from apps/netutils/netlib/uip_setifflag.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_setmacaddr.c (renamed from apps/netutils/netlib/uip_setmacaddr.c) | 0 | ||||
-rw-r--r-- | apps/netutils/netlib/netlib_setnetmask.c (renamed from apps/netutils/netlib/uip_setnetmask.c) | 0 |
14 files changed, 18 insertions, 18 deletions
diff --git a/apps/include/netutils/ipmsfilter.h b/apps/include/netutils/ipmsfilter.h index 286db496c..8849eab13 100644 --- a/apps/include/netutils/ipmsfilter.h +++ b/apps/include/netutils/ipmsfilter.h @@ -75,7 +75,7 @@ extern "C" { * * Description: * Add or remove an IP address from a multicast filter set. - * (See netutils/netlib/uip_ipmsfilter.c) + * (See netutils/netlib/netlib_ipmsfilter.c) * * Parameters: * ifname The name of the interface to use, size must less than IMSFNAMSIZ diff --git a/apps/netutils/netlib/Makefile b/apps/netutils/netlib/Makefile index 01157c1dd..b42607134 100644 --- a/apps/netutils/netlib/Makefile +++ b/apps/netutils/netlib/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/netutils/netlib/Makefile # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,50 +39,50 @@ include $(APPDIR)/Make.defs # UIP Library -ASRCS = -CSRCS = netlib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \ - uip_setnetmask.c uip_parsehttpurl.c uip_setifflag.c \ - uip_getifflag.c +ASRCS = +CSRCS = netlib.c netlib_sethostaddr.c netlib_gethostaddr.c +CSRCS += netlib_setdraddr.c netlib_setnetmask.c netlib_parsehttpurl.c +CSRCS += netlib_setifflag.c netlib_getifflag.c # These require TCP support ifeq ($(CONFIG_NET_TCP),y) -CSRCS += uip_server.c uip_listenon.c +CSRCS += netlib_server.c netlib_listenon.c endif # No MAC address support for SLIP (Ethernet only) ifneq ($(CONFIG_NET_SLIP),y) -CSRCS += uip_setmacaddr.c uip_getmacaddr.c +CSRCS += netlib_setmacaddr.c netlib_getmacaddr.c endif # IGMP support ifeq ($(CONFIG_NET_IGMP),y) -CSRCS += uip_ipmsfilter.c +CSRCS += netlib_ipmsfilter.c endif -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\..\libapps$(LIBEXT) + BIN = ..\..\libapps$(LIBEXT) else ifeq ($(WINTOOL),y) - BIN = ..\\..\\libapps$(LIBEXT) + BIN = ..\\..\\libapps$(LIBEXT) else - BIN = ../../libapps$(LIBEXT) + BIN = ../../libapps$(LIBEXT) endif endif -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/netlib/uip_gethostaddr.c b/apps/netutils/netlib/netlib_gethostaddr.c index e354ca9de..e354ca9de 100644 --- a/apps/netutils/netlib/uip_gethostaddr.c +++ b/apps/netutils/netlib/netlib_gethostaddr.c diff --git a/apps/netutils/netlib/uip_getifflag.c b/apps/netutils/netlib/netlib_getifflag.c index 8e82afe03..8e82afe03 100644 --- a/apps/netutils/netlib/uip_getifflag.c +++ b/apps/netutils/netlib/netlib_getifflag.c diff --git a/apps/netutils/netlib/uip_getmacaddr.c b/apps/netutils/netlib/netlib_getmacaddr.c index 8923f4bb1..8923f4bb1 100644 --- a/apps/netutils/netlib/uip_getmacaddr.c +++ b/apps/netutils/netlib/netlib_getmacaddr.c diff --git a/apps/netutils/netlib/uip_ipmsfilter.c b/apps/netutils/netlib/netlib_ipmsfilter.c index 1068d0804..1068d0804 100644 --- a/apps/netutils/netlib/uip_ipmsfilter.c +++ b/apps/netutils/netlib/netlib_ipmsfilter.c diff --git a/apps/netutils/netlib/uip_listenon.c b/apps/netutils/netlib/netlib_listenon.c index cacea174b..cacea174b 100644 --- a/apps/netutils/netlib/uip_listenon.c +++ b/apps/netutils/netlib/netlib_listenon.c diff --git a/apps/netutils/netlib/uip_parsehttpurl.c b/apps/netutils/netlib/netlib_parsehttpurl.c index efc88956a..efc88956a 100644 --- a/apps/netutils/netlib/uip_parsehttpurl.c +++ b/apps/netutils/netlib/netlib_parsehttpurl.c diff --git a/apps/netutils/netlib/uip_server.c b/apps/netutils/netlib/netlib_server.c index c6b3d1631..c6b3d1631 100644 --- a/apps/netutils/netlib/uip_server.c +++ b/apps/netutils/netlib/netlib_server.c diff --git a/apps/netutils/netlib/uip_setdraddr.c b/apps/netutils/netlib/netlib_setdraddr.c index bdc19d624..bdc19d624 100644 --- a/apps/netutils/netlib/uip_setdraddr.c +++ b/apps/netutils/netlib/netlib_setdraddr.c diff --git a/apps/netutils/netlib/uip_sethostaddr.c b/apps/netutils/netlib/netlib_sethostaddr.c index ada4431f5..ada4431f5 100644 --- a/apps/netutils/netlib/uip_sethostaddr.c +++ b/apps/netutils/netlib/netlib_sethostaddr.c diff --git a/apps/netutils/netlib/uip_setifflag.c b/apps/netutils/netlib/netlib_setifflag.c index c7a6dfb73..c7a6dfb73 100644 --- a/apps/netutils/netlib/uip_setifflag.c +++ b/apps/netutils/netlib/netlib_setifflag.c diff --git a/apps/netutils/netlib/uip_setmacaddr.c b/apps/netutils/netlib/netlib_setmacaddr.c index d35034a69..d35034a69 100644 --- a/apps/netutils/netlib/uip_setmacaddr.c +++ b/apps/netutils/netlib/netlib_setmacaddr.c diff --git a/apps/netutils/netlib/uip_setnetmask.c b/apps/netutils/netlib/netlib_setnetmask.c index 8b3f9651c..8b3f9651c 100644 --- a/apps/netutils/netlib/uip_setnetmask.c +++ b/apps/netutils/netlib/netlib_setnetmask.c |