sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/udp: Renaming some files to prevent name collision in libapps.a

Browse Source
This commit is contained in:
Gregory Nutt 2017-06-23 10:58:41 -06:00
parent c95983f778
commit 4f64213758
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/udp/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/examples/udp/Makefile # apps/examples/udp/Makefile
# #
# Copyright (C) 2007-2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2007-2008, 2011-2012, 2014, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -53,7 +53,7 @@ TARG1_CRCS += udp_server.c
else else
TARG1_CRCS += udp_client.c TARG1_CRCS += udp_client.c
endif endif
TARG1_MAINSRC = target1.c TARG1_MAINSRC = udp_target1.c
TARG1_COBJS = $(TARG1_CRCS:.c=$(OBJEXT)) TARG1_COBJS = $(TARG1_CRCS:.c=$(OBJEXT))
TARG1_MAINOBJ = $(TARG1_MAINSRC:.c=$(OBJEXT)) TARG1_MAINOBJ = $(TARG1_MAINSRC:.c=$(OBJEXT))
@ -82,7 +82,7 @@ TARG2_CRCS += udp_client.c
else else
TARG2_CRCS += udp_server.c TARG2_CRCS += udp_server.c
endif endif
TARG2_MAINSRC = target2.c TARG2_MAINSRC = udp_target2.c
TARG2_COBJS = $(TARG2_CRCS:.c=$(OBJEXT)) TARG2_COBJS = $(TARG2_CRCS:.c=$(OBJEXT))
TARG2_MAINOBJ = $(TARG2_MAINSRC:.c=$(OBJEXT)) TARG2_MAINOBJ = $(TARG2_MAINSRC:.c=$(OBJEXT))
@ -97,6 +97,7 @@ endif
CONFIG_EXAMPLES_UDP_PRIORITY2 ?= 100 CONFIG_EXAMPLES_UDP_PRIORITY2 ?= 100
CONFIG_EXAMPLES_UDP_STACKSIZE2 ?= 2048 CONFIG_EXAMPLES_UDP_STACKSIZE2 ?= 2048
PROGNAME2 = $(CONFIG_EXAMPLES_UDP_PROGNAME2) PROGNAME2 = $(CONFIG_EXAMPLES_UDP_PROGNAME2)
PRIORITY2 = $(CONFIG_EXAMPLES_UDP_PRIORITY2) PRIORITY2 = $(CONFIG_EXAMPLES_UDP_PRIORITY2)
STACKSIZE2 = $(CONFIG_EXAMPLES_UDP_STACKSIZE2) STACKSIZE2 = $(CONFIG_EXAMPLES_UDP_STACKSIZE2)
@ -117,16 +118,16 @@ ifneq ($(CONFIG_EXAMPLES_UDP_TARGET2),y)
HOSTCFLAGS += -DEXAMPLES_UDP_HOST=1 HOSTCFLAGS += -DEXAMPLES_UDP_HOST=1
HOSTOBJSEXT ?= o1 HOSTOBJSEXT ?= o1
HOST_SRCS = host.c udp_cmdline.c HOST_SRCS = udp_host.c udp_cmdline.c
ifeq ($(CONFIG_EXAMPLES_UDP_SERVER1),y) ifeq ($(CONFIG_EXAMPLES_UDP_SERVER1),y)
HOST_SRCS += udp_client.c HOST_SRCS += udp_client.c
HOST_BIN = udpclient$(EXEEXT)
else else
HOST_SRCS += udp_server.c HOST_SRCS += udp_server.c
HOST_BIN = udpserver$(EXEEXT)
endif endif
HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJSEXT)) HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJSEXT))
HOST_BIN = host$(EXEEXT)
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@ -161,7 +162,7 @@ VPATH =
all: .built all: .built
.PHONY: clean depend distclean preconfig .PHONY: clean depend distclean preconfig
$(TARG1_COBJS) $(TARG1_MAINOBJ)$(TARG2_COBJS) $(TARG2_MAINOBJ) $(TARGCMN_COBJS): %$(OBJEXT): %.c $(TARG1_COBJS) $(TARG1_MAINOBJ) $(TARG2_COBJS) $(TARG2_MAINOBJ) $(TARGCMN_COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
$(TARG_BIN): $(TARG_OBJS) $(HOST_BIN) $(TARG_BIN): $(TARG_OBJS) $(HOST_BIN)

2
examples/udp/host.c → examples/udp/udp_host.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/udp/host.c * examples/udp/udp_host.c
* *
* Copyright (C) 2007 Gregory Nutt. All rights reserved. * Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

2
examples/udp/target1.c → examples/udp/udp_target1.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/udp/target1.c * examples/udp/udp_target1.c
* *
* Copyright (C) 2007, 2011, 2015, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2011, 2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

2
examples/udp/target2.c → examples/udp/udp_target2.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/udp/target2.c * examples/udp/udp_target2.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>