diff --git a/ChangeLog b/ChangeLog index 7c8030fa3f3..3c451d0564b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -294,3 +294,5 @@ * Began adding support for the Zilog Z16F using the Zilog Z16F2800100ZCOG Development Kit. + * Fix Makefile error when Pascal P-Code interpreter is NOT installed (oops) + * Add support toolchains that do not support making of dependencies diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index a82874b270e..ada834701ba 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -774,6 +774,8 @@ Other memory: * Began adding support for the Zilog Z16F using the Zilog Z16F2800100ZCOG Development Kit. + * Fix Makefile error when Pascal P-Code interpreter is NOT installed (oops) + * Add support toolchains that do not support making of dependencies diff --git a/Makefile b/Makefile index b7e9047f335..8d9d0c7b74e 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ BOARD_DIR = configs/$(CONFIG_ARCH_BOARD) # Add-on directories. These may or may not be in place in the # NuttX source tree (they must be specifically installed) -PCODE_DIR := `if [ -r pcode/Makefile ]; then echo "pcode"; fi` +PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi} # FSDIRS depend on file descriptor support; NONFSDIRS do not # (except for parts of FSDIRS). We will exclude FSDIRS diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index e7f2aae5621..625f0226c45 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# Makefile +# arch/arm/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -36,7 +36,6 @@ -include $(TOPDIR)/Make.defs -include chip/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched diff --git a/arch/c5471/src/Makefile b/arch/c5471/src/Makefile index c91a1820e70..c9b6229bbd2 100644 --- a/arch/c5471/src/Makefile +++ b/arch/c5471/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# arch/c5471/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = up_vectors.S up_saveusercontext.S up_fullcontextrestore.S diff --git a/arch/dm320/src/Makefile b/arch/dm320/src/Makefile index 80f73d15d9e..d9ff513919d 100644 --- a/arch/dm320/src/Makefile +++ b/arch/dm320/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# arch/dm320/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = up_vectors.S up_saveusercontext.S up_fullcontextrestore.S \ diff --git a/arch/pjrc-8051/src/Makefile b/arch/pjrc-8051/src/Makefile index 5eae25abcfc..727ef0fdf27 100644 --- a/arch/pjrc-8051/src/Makefile +++ b/arch/pjrc-8051/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# arch/pjrc-8051/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASFLAGS = -x -j -g -l -s -p CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) -D__ASSEMBLY__ diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index 6e5af4253a6..83da1d411c1 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# arch/sim/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = up_setjmp.S diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile index 225ed3b299b..93eaff14768 100644 --- a/arch/z16/src/Makefile +++ b/arch/z16/src/Makefile @@ -36,7 +36,6 @@ -include $(TOPDIR)/Make.defs -include chip/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile index a72171e7ab1..5c9ccb5d3f0 100644 --- a/arch/z80/src/Makefile +++ b/arch/z80/src/Makefile @@ -41,9 +41,6 @@ ############################################################################ # Tools - -MKDEP = $(TOPDIR)/tools/mkdeps.sh - # CFLAGS, CPPFLAGS, ASFLAGS, LDFLAGS are set in $(TOPDIR)/Make.defs CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched diff --git a/configs/c5471evm/Make.defs b/configs/c5471evm/Make.defs index 6a3dc119a99..1dd6117c69b 100644 --- a/configs/c5471evm/Make.defs +++ b/configs/c5471evm/Make.defs @@ -1,7 +1,7 @@ -############################################################ -# Make.defs +############################################################################ +# configs/c5471evm/Make.defs # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ include ${TOPDIR}/.config @@ -73,4 +73,6 @@ HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = +MKDEP = $(TOPDIR)/tools/mkdeps.sh + diff --git a/configs/c5471evm/src/Makefile b/configs/c5471evm/src/Makefile index a5b899337b2..43f13767ef1 100644 --- a/configs/c5471evm/src/Makefile +++ b/configs/c5471evm/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# configs/c5471evm/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = diff --git a/configs/m68332evb/Make.defs b/configs/m68332evb/Make.defs index 7d62fad823e..9bb06d34906 100644 --- a/configs/m68332evb/Make.defs +++ b/configs/m68332evb/Make.defs @@ -1,7 +1,7 @@ -############################################################ -# Make.defs +############################################################################ +# configs/m68332evb/Make.defs # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ include ${TOPDIR}/.config @@ -72,3 +72,5 @@ HOSTCC = gcc HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = + +MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/configs/m68332evb/src/Makefile b/configs/m68332evb/src/Makefile index 5f2bd80831d..75af74e3b23 100644 --- a/configs/m68332evb/src/Makefile +++ b/configs/m68332evb/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# configs/m68332evb/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = diff --git a/configs/mcu123-lpc214x/Make.defs b/configs/mcu123-lpc214x/Make.defs index ea6f051ae51..5bf5a0d1048 100644 --- a/configs/mcu123-lpc214x/Make.defs +++ b/configs/mcu123-lpc214x/Make.defs @@ -1,7 +1,7 @@ -############################################################ -# Make.defs +############################################################################ +# configs/mcu123-lpc214x/Make.defs # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name Gregory NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ include ${TOPDIR}/.config @@ -73,3 +73,5 @@ HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = +MKDEP = $(TOPDIR)/tools/mkdeps.sh + diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile index 01fb4997abf..4eb1a367d0a 100644 --- a/configs/mcu123-lpc214x/src/Makefile +++ b/configs/mcu123-lpc214x/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# configs/mcu123-lpc214x/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched diff --git a/configs/ntosd-dm320/Make.defs b/configs/ntosd-dm320/Make.defs index 6a776f10e35..33d6dd85124 100644 --- a/configs/ntosd-dm320/Make.defs +++ b/configs/ntosd-dm320/Make.defs @@ -1,7 +1,7 @@ -############################################################ -# Make.defs +############################################################################ +# configs/ntosd-dm320/Make.defs # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ include ${TOPDIR}/.config @@ -73,3 +73,5 @@ HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = +MKDEP = $(TOPDIR)/tools/mkdeps.sh + diff --git a/configs/ntosd-dm320/src/Makefile b/configs/ntosd-dm320/src/Makefile index 862f23a667c..91493c2f927 100644 --- a/configs/ntosd-dm320/src/Makefile +++ b/configs/ntosd-dm320/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# Makefile +# configs/ntosd-dm320/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -35,7 +35,6 @@ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = diff --git a/configs/pjrc-8051/Make.defs b/configs/pjrc-8051/Make.defs index e16f5b3cefc..7891d6b73de 100644 --- a/configs/pjrc-8051/Make.defs +++ b/configs/pjrc-8051/Make.defs @@ -1,7 +1,7 @@ -############################################################ -# Make.defs +############################################################################ +# configs/pjrc-8051/Make.defs # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ include ${TOPDIR}/.config @@ -67,4 +67,6 @@ HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = +MKDEP = $(TOPDIR)/tools/mkdeps.sh + diff --git a/configs/pjrc-8051/src/Makefile b/configs/pjrc-8051/src/Makefile index c71e28cfb64..805003035be 100644 --- a/configs/pjrc-8051/src/Makefile +++ b/configs/pjrc-8051/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# configs/pjrc-8051/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = diff --git a/configs/sim/Make.defs b/configs/sim/Make.defs index de9916e23b7..972f53cbf1a 100644 --- a/configs/sim/Make.defs +++ b/configs/sim/Make.defs @@ -1,7 +1,7 @@ -############################################################ -# Make.defs +############################################################################ +# configs/sim/Make.defs # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ include ${TOPDIR}/.config @@ -72,3 +72,5 @@ HOSTINCLUDES = -I. HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) -pipe HOSTLDFLAGS = + +MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile index 5f2bd80831d..c83c6a03fd1 100644 --- a/configs/sim/src/Makefile +++ b/configs/sim/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# configs/sim/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = diff --git a/configs/z16f2800100zcog/Make.defs b/configs/z16f2800100zcog/Make.defs index 8dc852ff77b..a690606cae8 100644 --- a/configs/z16f2800100zcog/Make.defs +++ b/configs/z16f2800100zcog/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# z16f2800100zcog/Make.defs +# configs/z16f2800100zcog/Make.defs # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -87,3 +87,5 @@ HOSTCC = gcc HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = + +MKDEP = $(TOPDIR)/tools/mknulldeps.sh diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index 6fa34884241..96acd71010c 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# board/Makefile +# configs/z16f2800100zcog/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -35,7 +35,6 @@ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched ASRCS = diff --git a/configs/z80sim/Make.defs b/configs/z80sim/Make.defs index 3ac3135bc6c..0038dce4278 100644 --- a/configs/z80sim/Make.defs +++ b/configs/z80sim/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# Make.defs +# configs/z80sim/Make.defs # # Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -72,4 +72,4 @@ HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = - +MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/configs/z80sim/src/Makefile b/configs/z80sim/src/Makefile index d1f49560886..912868e9214 100644 --- a/configs/z80sim/src/Makefile +++ b/configs/z80sim/src/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# configs/z80sim/src/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,11 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched -I$(TOPDIR)/arch/z80/src/common -I$(TOPDIR)/arch/z80/src/z80 ASRCS = diff --git a/drivers/Makefile b/drivers/Makefile index d4185bc477c..f02c8a39534 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# drivers/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,12 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ifeq ($(CONFIG_NET),y) include net/Make.defs endif diff --git a/examples/mount/Makefile b/examples/mount/Makefile index 095f348ef9c..20c5a21c32d 100644 --- a/examples/mount/Makefile +++ b/examples/mount/Makefile @@ -1,7 +1,7 @@ -############################################################ +############################################################################ # Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = mount_main.c diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index 55cb4d30f54..8d2041a4c22 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# examples/nettest/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - TARG_ASRCS = TARG_AOBJS = $(TARG_ASRCS:.S=$(OBJEXT)) diff --git a/examples/nsh/Makefile b/examples/nsh/Makefile index 56c5611a0ef..91b57dd6635 100644 --- a/examples/nsh/Makefile +++ b/examples/nsh/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nsh/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -36,8 +36,6 @@ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = CSRCS = nsh_main.c nsh_fscmds.c nsh_proccmds.c nsh_envcmds.c diff --git a/examples/null/Makefile b/examples/null/Makefile index a8034703c76..7b7b576f6e1 100644 --- a/examples/null/Makefile +++ b/examples/null/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# examples/null/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = null_main.c diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile index 161ddafe2ef..28a21794f91 100644 --- a/examples/ostest/Makefile +++ b/examples/ostest/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# examples/ostest/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = main.c dev_null.c diff --git a/examples/udp/Makefile b/examples/udp/Makefile index 3dcc572138e..73f916a1b4b 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# examples/udp/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - TARG_ASRCS = TARG_AOBJS = $(TARG_ASRCS:.S=$(OBJEXT)) diff --git a/examples/uip/Makefile b/examples/uip/Makefile index 6d10d8e9b22..4245c35a56a 100644 --- a/examples/uip/Makefile +++ b/examples/uip/Makefile @@ -1,7 +1,7 @@ -############################################################ -# Makefile +############################################################################ +# examples/uip/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = main.c diff --git a/fs/Makefile b/fs/Makefile index 459b46c38ac..14eb5cf3b1e 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -1,7 +1,7 @@ ############################################################################ # fs/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -35,8 +35,6 @@ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/lib/Makefile b/lib/Makefile index 1ea90971bae..ce98422b2d0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,7 +1,7 @@ ############################################################################ # lib/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,8 +35,6 @@ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/mm/Makefile b/mm/Makefile index c00a7a2aed5..b3e5bfe7622 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -1,5 +1,5 @@ -############################################################ -# Makefile +############################################################################ +# mm/Makefile # # Copyright (C) 2007 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,12 +31,10 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=.o) CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \ diff --git a/net/Makefile b/net/Makefile index a56e5942e19..79621aeb609 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,7 +1,7 @@ ############################################################################ # net/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,8 +36,6 @@ -include $(TOPDIR)/Make.defs CFLAGS += -I./uip -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ifeq ($(CONFIG_NET),y) SOCK_ASRCS = SOCK_CSRCS = socket.c bind.c connect.c sendto.c recv.c recvfrom.c \ diff --git a/netutils/Makefile b/netutils/Makefile index 0c14a109455..5e298e72564 100644 --- a/netutils/Makefile +++ b/netutils/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# Makefile +# netutils/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,8 +35,6 @@ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ifeq ($(CONFIG_NET),y) include uiplib/Make.defs ifeq ($(CONFIG_NET_TCP),y) diff --git a/sched/Makefile b/sched/Makefile index eb0473f66dc..8bd0cd80ec0 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# Makefile +# sched/Makefile # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -35,8 +35,6 @@ -include $(TOPDIR)/Make.defs -MKDEP = $(TOPDIR)/tools/mkdeps.sh - ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT))