From d2aa24ad88f32add1d944c4885ec11c660841569 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 9 Jun 2016 10:51:04 -0600 Subject: [PATCH] Make sure that APPNAME is defined in all Makefiles that generate applications --- examples/configdata/Makefile | 2 ++ examples/hidkbd/Makefile | 2 ++ examples/mm/Makefile | 2 ++ examples/mount/Makefile | 2 ++ examples/mtdpart/Makefile | 6 ++++-- examples/mtdpart/mtdpart_main.c | 6 +----- examples/mtdrwb/Makefile | 6 ++++-- examples/nsh/Makefile | 2 ++ examples/nxffs/Makefile | 6 ++++-- examples/pashello/Makefile | 2 ++ examples/pipe/Makefile | 2 ++ examples/rgmp/Makefile | 2 ++ examples/sendmail/Makefile | 2 ++ examples/serloop/Makefile | 2 ++ examples/smart/Makefile | 2 ++ examples/uavcan/Makefile | 2 ++ examples/wget/Makefile | 2 ++ nshlib/Kconfig | 2 +- 18 files changed, 40 insertions(+), 12 deletions(-) diff --git a/examples/configdata/Makefile b/examples/configdata/Makefile index d3a23e212..fa0bb9efc 100644 --- a/examples/configdata/Makefile +++ b/examples/configdata/Makefile @@ -37,6 +37,8 @@ # CONFIGDATA Unit Test +APPNAME = configdata + ASRCS = CSRCS = MAINSRC = configdata_main.c diff --git a/examples/hidkbd/Makefile b/examples/hidkbd/Makefile index 32fd923a6..8b0298ea9 100644 --- a/examples/hidkbd/Makefile +++ b/examples/hidkbd/Makefile @@ -37,6 +37,8 @@ # USB Host HID keyboard Example +APPNAME = hidkbd + ASRCS = CSRCS = MAINSRC = hidkbd_main.c diff --git a/examples/mm/Makefile b/examples/mm/Makefile index 3f86b95f7..1a832863b 100644 --- a/examples/mm/Makefile +++ b/examples/mm/Makefile @@ -37,6 +37,8 @@ # Memory Management Test +APPNAME = mm + ASRCS = CSRCS = MAINSRC = mm_main.c diff --git a/examples/mount/Makefile b/examples/mount/Makefile index 295389c60..900dae568 100644 --- a/examples/mount/Makefile +++ b/examples/mount/Makefile @@ -37,6 +37,8 @@ # mount() test +APPNAME = mount + ASRCS = CSRCS = ramdisk.c MAINSRC = mount_main.c diff --git a/examples/mtdpart/Makefile b/examples/mtdpart/Makefile index 3a5a2f2af..eff6cdc29 100755 --- a/examples/mtdpart/Makefile +++ b/examples/mtdpart/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/mtdpart/Makefile # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,9 @@ -include $(TOPDIR)/Make.defs -# Hello, World! Example +# MTD Partition Example + +APPNAME = mtdpart ASRCS = CSRCS = diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c index 66edadb5c..b600875e4 100644 --- a/examples/mtdpart/mtdpart_main.c +++ b/examples/mtdpart/mtdpart_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/mtdpart/mtdpart_main.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -127,10 +127,6 @@ static uint8_t g_simflash[MTDPART_BUFSIZE]; extern FAR struct mtd_dev_s *mtdpart_archinitialize(void); #endif -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/examples/mtdrwb/Makefile b/examples/mtdrwb/Makefile index c284910b8..ad5767ddd 100755 --- a/examples/mtdrwb/Makefile +++ b/examples/mtdrwb/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examplex/mtdrwb/Makefile # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,9 @@ -include $(TOPDIR)/Make.defs -# Hello, World! Example +# MTD R/W buffer test Example + +APPNAME = mtdrwb ASRCS = CSRCS = diff --git a/examples/nsh/Makefile b/examples/nsh/Makefile index bfb6958a7..1baad89b9 100644 --- a/examples/nsh/Makefile +++ b/examples/nsh/Makefile @@ -37,6 +37,8 @@ # NuttShell (NSH) Example +APPNAME = nsh + ASRCS = CSRCS = MAINSRC = nsh_main.c diff --git a/examples/nxffs/Makefile b/examples/nxffs/Makefile index 045d3a55b..1227d2714 100644 --- a/examples/nxffs/Makefile +++ b/examples/nxffs/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/nxffs/Makefile # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,9 @@ -include $(TOPDIR)/Make.defs -# Hello, World! Example +# NXFFS file system example + +APPNAME = nxffs ASRCS = CSRCS = diff --git a/examples/pashello/Makefile b/examples/pashello/Makefile index 403173867..95ad4754d 100644 --- a/examples/pashello/Makefile +++ b/examples/pashello/Makefile @@ -37,6 +37,8 @@ # Pascal Add-On Example +APPNAME = pashello + ifeq ($(WINTOOL),y) INCDIROPT = -w endif diff --git a/examples/pipe/Makefile b/examples/pipe/Makefile index 62d1ac584..08d5216aa 100644 --- a/examples/pipe/Makefile +++ b/examples/pipe/Makefile @@ -37,6 +37,8 @@ # Pipe Example +APPNAME = pipe + ASRCS = CSRCS = transfer_test.c interlock_test.c redirect_test.c MAINSRC = pipe_main.c diff --git a/examples/rgmp/Makefile b/examples/rgmp/Makefile index 2cc19a0cf..b435ad3f8 100644 --- a/examples/rgmp/Makefile +++ b/examples/rgmp/Makefile @@ -37,6 +37,8 @@ # The smallest thing you can build -- the NULL example. +APPNAME = rgmp + ASRCS = CSRCS = MAINSRC = rgmp_main.c diff --git a/examples/sendmail/Makefile b/examples/sendmail/Makefile index 3a0430744..87d66431a 100644 --- a/examples/sendmail/Makefile +++ b/examples/sendmail/Makefile @@ -37,6 +37,8 @@ # Sendmail SMTP Example +APPNAME = sendmail + ASRCS = CSRCS = MAINSRC = sendmail_main.c diff --git a/examples/serloop/Makefile b/examples/serloop/Makefile index 716e2622b..102a2474e 100644 --- a/examples/serloop/Makefile +++ b/examples/serloop/Makefile @@ -37,6 +37,8 @@ # Mindlessly simple console loopack test +APPNAME = serloop + ASRCS = CSRCS = MAINSRC = serloop_main.c diff --git a/examples/smart/Makefile b/examples/smart/Makefile index e612c8e5a..0f30aca86 100644 --- a/examples/smart/Makefile +++ b/examples/smart/Makefile @@ -37,6 +37,8 @@ # SMART file system stress test +APPNAME = smart + ASRCS = CSRCS = MAINSRC = smart_main.c diff --git a/examples/uavcan/Makefile b/examples/uavcan/Makefile index 8d5df1888..1d1712f2b 100644 --- a/examples/uavcan/Makefile +++ b/examples/uavcan/Makefile @@ -35,6 +35,8 @@ -include $(TOPDIR)/Make.defs +APPNAME = uavcan + MAINSRC = uavcan_main.cxx CXXFLAGS += -I$(TOPDIR)/include/apps diff --git a/examples/wget/Makefile b/examples/wget/Makefile index 9fa488e41..368550634 100644 --- a/examples/wget/Makefile +++ b/examples/wget/Makefile @@ -41,6 +41,8 @@ ASRCS = CSRCS = MAINSRC = wget_main.c +APPNAME = wget + CONFIG_XYZ_PROGNAME ?= wget$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) diff --git a/nshlib/Kconfig b/nshlib/Kconfig index eabdcb6f6..cf6788248 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -947,7 +947,7 @@ config NSH_NETINIT default y depends on NET ---help--- - This option enables/disables all network initialization in NSH. + This option enables/disables all network initialization in NSH. if NSH_NETINIT