From 46f39c4adab2144ee3e7f11a02f0d2253b656668 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 28 Aug 2010 18:06:51 +0000 Subject: Replace CONFIG_EXAMPLE with CONFIG_APP_DIR git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2893 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/examples/README.txt | 10 ++++++---- nuttx/examples/dhcpd/Makefile | 4 ++-- nuttx/examples/hello/Makefile | 4 ++-- nuttx/examples/helloxx/Makefile | 4 ++-- nuttx/examples/igmp/Makefile | 2 +- nuttx/examples/mount/Makefile | 4 ++-- nuttx/examples/nettest/Makefile | 4 ++-- nuttx/examples/nsh/Makefile | 4 ++-- nuttx/examples/null/Makefile | 4 ++-- nuttx/examples/nx/Makefile | 4 ++-- nuttx/examples/nxflat/Makefile | 4 ++-- nuttx/examples/ostest/Makefile | 4 ++-- nuttx/examples/pashello/Makefile | 4 ++-- nuttx/examples/pipe/Makefile | 4 ++-- nuttx/examples/poll/Makefile | 4 ++-- nuttx/examples/romfs/Makefile | 4 ++-- nuttx/examples/sendmail/Makefile | 4 ++-- nuttx/examples/serloop/Makefile | 4 ++-- nuttx/examples/thttpd/Makefile | 4 ++-- nuttx/examples/udp/Makefile | 4 ++-- nuttx/examples/uip/Makefile | 4 ++-- nuttx/examples/usbserial/Makefile | 4 ++-- nuttx/examples/usbstorage/Makefile | 4 ++-- nuttx/examples/wget/Makefile | 4 ++-- 24 files changed, 51 insertions(+), 49 deletions(-) (limited to 'nuttx/examples') diff --git a/nuttx/examples/README.txt b/nuttx/examples/README.txt index ad301dbab..e6075ec84 100644 --- a/nuttx/examples/README.txt +++ b/nuttx/examples/README.txt @@ -2,11 +2,13 @@ examples ^^^^^^^^ The examples directory contains several sample applications that - can be linked with nuttx. The specific example is selected in the - configs//defconfig file via the CONFIG_EXAMPLE setting. - For example, + can be linked with NuttX. The specific example is selected in the + configs//defconfig file via the CONFIG_APP_DIR setting. + This setting provides the path to the directory containing the + application Makefile (this path is a relative to the NuttX top- + level directory). For example, - CONFIG_EXAMPLE=ostest + CONFIG_APP_DIR=examples/ostest Selects the examples/ostest example. diff --git a/nuttx/examples/dhcpd/Makefile b/nuttx/examples/dhcpd/Makefile index aee288668..2a154136b 100644 --- a/nuttx/examples/dhcpd/Makefile +++ b/nuttx/examples/dhcpd/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/dhcpd/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/hello/Makefile b/nuttx/examples/hello/Makefile index fd91fef11..5fd80c394 100644 --- a/nuttx/examples/hello/Makefile +++ b/nuttx/examples/hello/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/hello/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/helloxx/Makefile b/nuttx/examples/helloxx/Makefile index 7210ea2f1..5a90b03c5 100755 --- a/nuttx/examples/helloxx/Makefile +++ b/nuttx/examples/helloxx/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/helloxx/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) .PHONY: clean depend chkcxx diff --git a/nuttx/examples/igmp/Makefile b/nuttx/examples/igmp/Makefile index 2f3d93ff4..b1e92b942 100755 --- a/nuttx/examples/igmp/Makefile +++ b/nuttx/examples/igmp/Makefile @@ -45,7 +45,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/mount/Makefile b/nuttx/examples/mount/Makefile index 084fc8fb6..31067966e 100644 --- a/nuttx/examples/mount/Makefile +++ b/nuttx/examples/mount/Makefile @@ -1,7 +1,7 @@ ############################################################################ # Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/nettest/Makefile b/nuttx/examples/nettest/Makefile index 6677f847f..5fda016fb 100644 --- a/nuttx/examples/nettest/Makefile +++ b/nuttx/examples/nettest/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nettest/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -TARG_BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +TARG_BIN = libapp$(LIBEXT) HOSTCFLAGS += -DCONFIG_EXAMPLE_NETTEST_HOST=1 ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y) diff --git a/nuttx/examples/nsh/Makefile b/nuttx/examples/nsh/Makefile index 341f59080..41f1aa44e 100644 --- a/nuttx/examples/nsh/Makefile +++ b/nuttx/examples/nsh/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nsh/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -65,7 +65,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/null/Makefile b/nuttx/examples/null/Makefile index 3eb745b41..53efcbe39 100644 --- a/nuttx/examples/null/Makefile +++ b/nuttx/examples/null/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/null/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/nx/Makefile b/nuttx/examples/nx/Makefile index 002e255ec..ea19ebcc5 100644 --- a/nuttx/examples/nx/Makefile +++ b/nuttx/examples/nx/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nxflat/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,7 +50,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/nxflat/Makefile b/nuttx/examples/nxflat/Makefile index fa740370f..dae8a4ea7 100644 --- a/nuttx/examples/nxflat/Makefile +++ b/nuttx/examples/nxflat/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nxflat/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) .PHONY: headers clean distclean diff --git a/nuttx/examples/ostest/Makefile b/nuttx/examples/ostest/Makefile index d04de7bfe..5fc3cfad9 100644 --- a/nuttx/examples/ostest/Makefile +++ b/nuttx/examples/ostest/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/ostest/Makefile # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -85,7 +85,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/pashello/Makefile b/nuttx/examples/pashello/Makefile index aeb220028..fd91e1124 100644 --- a/nuttx/examples/pashello/Makefile +++ b/nuttx/examples/pashello/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/pashello/Makefile # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/pipe/Makefile b/nuttx/examples/pipe/Makefile index 4f61e86b8..72cd67ee7 100644 --- a/nuttx/examples/pipe/Makefile +++ b/nuttx/examples/pipe/Makefile @@ -1,7 +1,7 @@ ############################################################################ # Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/poll/Makefile b/nuttx/examples/poll/Makefile index e91f5018c..c8c4f1f1a 100644 --- a/nuttx/examples/poll/Makefile +++ b/nuttx/examples/poll/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/poll/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/romfs/Makefile b/nuttx/examples/romfs/Makefile index 301d1b27c..67f68de9d 100644 --- a/nuttx/examples/romfs/Makefile +++ b/nuttx/examples/romfs/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/romfs/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/sendmail/Makefile b/nuttx/examples/sendmail/Makefile index 0907345d4..2fac537d2 100644 --- a/nuttx/examples/sendmail/Makefile +++ b/nuttx/examples/sendmail/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/sendmail/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/serloop/Makefile b/nuttx/examples/serloop/Makefile index a75d9a964..4f6f53a6b 100644 --- a/nuttx/examples/serloop/Makefile +++ b/nuttx/examples/serloop/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/serloop/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/thttpd/Makefile b/nuttx/examples/thttpd/Makefile index 2d9b271a0..696117e64 100644 --- a/nuttx/examples/thttpd/Makefile +++ b/nuttx/examples/thttpd/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/thttpd/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) .PHONY: clean headers diff --git a/nuttx/examples/udp/Makefile b/nuttx/examples/udp/Makefile index a4d4fdd5e..da833f010 100644 --- a/nuttx/examples/udp/Makefile +++ b/nuttx/examples/udp/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/udp/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -TARG_BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +TARG_BIN = libapp$(LIBEXT) HOSTCFLAGS += -DCONFIG_EXAMPLE_UDP_HOST=1 ifeq ($(CONFIG_EXAMPLE_UDP_SERVER),y) diff --git a/nuttx/examples/uip/Makefile b/nuttx/examples/uip/Makefile index c9b6932d8..e90f7ca42 100644 --- a/nuttx/examples/uip/Makefile +++ b/nuttx/examples/uip/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/uip/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/usbserial/Makefile b/nuttx/examples/usbserial/Makefile index f71008783..a2fe9f41b 100644 --- a/nuttx/examples/usbserial/Makefile +++ b/nuttx/examples/usbserial/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/usbserial/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/usbstorage/Makefile b/nuttx/examples/usbstorage/Makefile index 43bd4d4e6..de69e5911 100644 --- a/nuttx/examples/usbstorage/Makefile +++ b/nuttx/examples/usbstorage/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/hello/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/wget/Makefile b/nuttx/examples/wget/Makefile index aad645f3c..dc00702c7 100644 --- a/nuttx/examples/wget/Makefile +++ b/nuttx/examples/wget/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/wget/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) -- cgit v1.2.3