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

Add apps/include to include path in top-level Make.defs file. Remove multiple definitions of INCDIR opt.

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-11 10:45:17 -06:00
parent 2cbad44f1d
commit 3e83aa7388
23 changed files with 32 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Make.defs
View File

@ -2,7 +2,7 @@
# apps/Make.defs # apps/Make.defs
# Common make definitions provided to all applications # Common make definitions provided to all applications
# #
# Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2011, 2014, 2016 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
@ -34,6 +34,8 @@
# #
############################################################################ ############################################################################
# Builtin Registration
BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry
DEPCONFIG = $(TOPDIR)$(DELIM).config DEPCONFIG = $(TOPDIR)$(DELIM).config
@ -61,3 +63,11 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
else else
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
endif endif
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Standard include path
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}

6
graphics/screenshot/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/examples/screenshot/Makefile # apps/examples/screenshot/Makefile
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# TIFF Screenshot utility # TIFF Screenshot utility
ASRCS = ASRCS =

6
graphics/traveler/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/graphics/traveler/Makefile # apps/graphics/traveler/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 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
@ -109,10 +109,6 @@ endif
CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT) CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT)
PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME) PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME)
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TRAVELER_INC)} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TRAVELER_INC)}
DEPPATH = --dep-path . --dep-path src DEPPATH = --dep-path . --dep-path src

6
interpreters/bas/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/bas/Makefile # apps/bas/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 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
@ -50,10 +50,6 @@ endif
DEPPATH = --dep-path . DEPPATH = --dep-path .
VPATH = . VPATH = .
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))

6
interpreters/ficl/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/interpreters/ficl/Makefile # apps/interpreters/ficl/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012, 2016 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
@ -40,10 +40,6 @@ include $(APPDIR)/Make.defs
# Tools # Tools
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Include paths # Include paths
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src}

6
modbus/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/modbus/Makefile # apps/modbus/Makefile
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012, 2016 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
@ -48,10 +48,6 @@ CSRCS += mb.c
DEPPATH = --dep-path . DEPPATH = --dep-path .
VPATH = . VPATH = .
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
include ascii/Make.defs include ascii/Make.defs
include functions/Make.defs include functions/Make.defs
include nuttx/Make.defs include nuttx/Make.defs

6
system/cle/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/cle/Makefile # apps/system/cle/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# EMACS-like Command Line Editor (CLE) # EMACS-like Command Line Editor (CLE)
ASRCS = ASRCS =

6
system/flash_eraseall/Makefile
View File

@ -42,11 +42,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y) # flash_eraseall Application
INCDIROPT = -w
endif
# Hello Application
# TODO: appname can be automatically extracted from the directory name # TODO: appname can be automatically extracted from the directory name
APPNAME = flash_eraseall APPNAME = flash_eraseall

5
system/free/Makefile
View File

@ -2,6 +2,7 @@
# apps/system/free/Makefile # apps/system/free/Makefile
# #
# Copyright (C) 2011-2012 Uros Platise. All rights reserved. # Copyright (C) 2011-2012 Uros Platise. All rights reserved.
# Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
# Author: Uros Platise <uros.platise@isotel.eu> # Author: Uros Platise <uros.platise@isotel.eu>
# Gregory Nutt <gnutt@nuttx.org> # Gregory Nutt <gnutt@nuttx.org>
# #
@ -38,10 +39,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Replacement free command # Replacement free command
APPNAME = free APPNAME = free

6
system/hexed/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/hexed/Makefile # apps/system/hexed/Makefile
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015-2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# hexed Application # hexed Application
CONFIG_SYSTEM_HEXED_PRIORITY ?= SCHED_PRIORITY_DEFAULT CONFIG_SYSTEM_HEXED_PRIORITY ?= SCHED_PRIORITY_DEFAULT

8
system/install/Makefile
View File

@ -2,7 +2,7 @@
# apps/system/install/Makefile # apps/system/install/Makefile
# #
# Copyright (C) 2011 Uros Platise. All rights reserved. # Copyright (C) 2011 Uros Platise. All rights reserved.
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
# Author: Uros Platise <uros.platise@isotel.eu> # Author: Uros Platise <uros.platise@isotel.eu>
# Gregory Nutt <gnutt@nuttx.org> # Gregory Nutt <gnutt@nuttx.org>
# #
@ -42,11 +42,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y) # Install Application
INCDIROPT = -w
endif
# Hello Application
# TODO: appname can be automatically extracted from the directory name # TODO: appname can be automatically extracted from the directory name
APPNAME = install APPNAME = install

6
system/lm75/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/lm75/Makefile # apps/system/lm75/Makefile
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015-2016 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
@ -40,10 +40,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# LM-75 Temperature Sensor Application # LM-75 Temperature Sensor Application
CONFIG_SYSTEM_LM75_PRIORITY ?= 100 CONFIG_SYSTEM_LM75_PRIORITY ?= 100

6
system/netdb/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/netdb/Makefile # apps/system/netdb/Makefile
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015-2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# netdb Application # netdb Application
CONFIG_SYSTEM_NETDB_STACKSIZE ?= 2048 CONFIG_SYSTEM_NETDB_STACKSIZE ?= 2048

6
system/nxplayer/Makefile
View File

@ -2,7 +2,7 @@
# apps/system/nxplayer/Makefile # apps/system/nxplayer/Makefile
# #
# Copyright (C) 2013 Ken Pettit. All rights reserved. # Copyright (C) 2013 Ken Pettit. All rights reserved.
# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved.
# Author: Ken Pettit <pettitkd@gmail.com> # Author: Ken Pettit <pettitkd@gmail.com>
# Gregory Nutt <gnutt@nuttx.org> # Gregory Nutt <gnutt@nuttx.org>
# #
@ -39,10 +39,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# NxPlayer Library # NxPlayer Library
ASRCS = ASRCS =

6
system/prun/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/prun/Makefile # apps/system/prun/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 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
@ -39,10 +39,6 @@ include $(APPDIR)/Make.defs
# Pascal P-Code interpreter / Virtual machine # Pascal P-Code interpreter / Virtual machine
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
"." \ "." \
"$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \

12
system/prun/prun.c
View File

@ -50,18 +50,6 @@
#include "pedefs.h" #include "pedefs.h"
#include "prun.h" #include "prun.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

4
system/ramtest/Makefile
View File

@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# RAM test # RAM test
PRIORITY = SCHED_PRIORITY_DEFAULT PRIORITY = SCHED_PRIORITY_DEFAULT

6
system/readline/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/readline/Makefile # apps/system/readline/Makefile
# #
# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Copyright (C) 2012-2013, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# The Readline Library # The Readline Library
ASRCS = ASRCS =

6
system/stackmonitor/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/stackmonitor/Makefile # apps/system/stackmonitor/Makefile
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Stack Monitor Application # Stack Monitor Application
PRIORITY = SCHED_PRIORITY_DEFAULT PRIORITY = SCHED_PRIORITY_DEFAULT

6
system/sudoku/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/sudoku/Makefile # apps/system/sudoku/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Sudoku Application # Sudoku Application
CONFIG_SYSTEM_SUDOKU_STACKSIZE ?= 1536 CONFIG_SYSTEM_SUDOKU_STACKSIZE ?= 1536

6
system/symtab/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/symtab/Makefile # apps/system/symtab/Makefile
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015-2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Symbol table support # Symbol table support
ASRCS = ASRCS =

6
system/vi/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/vi/Makefile # apps/system/vi/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# VI-Workalike Editor # VI-Workalike Editor
CONFIG_SYSTEM_VI_STACKSIZE ?= 2048 CONFIG_SYSTEM_VI_STACKSIZE ?= 2048

6
system/zmodem/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/system/zmodem/Makefile # apps/system/zmodem/Makefile
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013, 2016 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
@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Zmodem sz and rz commands # Zmodem sz and rz commands
PRIORITY = SCHED_PRIORITY_DEFAULT PRIORITY = SCHED_PRIORITY_DEFAULT