From 6abb81797f0fa660dbbbc660e414622e04da6a13 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 3 Apr 2011 18:42:33 +0000 Subject: [PATCH] Pass __KERNEL__ define (or not) to all makes to handle small differences in user-/kernel-builds git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3459 42af7a65-404d-4744-a932-0658087f49c3 --- arch/8051/src/Makefile | 6 +++--- arch/arm/src/Makefile | 4 ++-- arch/avr/src/Makefile | 4 ++-- arch/hc/src/Makefile | 2 +- arch/sh/src/Makefile | 2 +- arch/x86/src/Makefile | 2 +- arch/z16/src/Makefile | 6 +++--- arch/z80/src/Makefile.sdcc | 4 ++-- arch/z80/src/Makefile.zdsii | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/8051/src/Makefile b/arch/8051/src/Makefile index 9152bfa3677..6f1907bc426 100644 --- a/arch/8051/src/Makefile +++ b/arch/8051/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched ASFLAGS = -x -j -g -l -s -p -CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) -D__ASSEMBLY__ +CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -D__ASSEMBLY__ SSRCS = ASRCS = $(SSRCS:.S=$(ASMEXT)) @@ -165,7 +165,7 @@ $(SDCCLIBDIR)/libmysdcc.lib: $(SDCCLIBDIR)/libsdcc.lib # This builds the libboard library in the board/ subdirectory board/libboard$(LIBEXT): - $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) + $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) # This target builds the final executable @@ -194,7 +194,7 @@ up_irqtest.ihx: $(TESTOBJS) $(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@ irqtest: - $(MAKE) TOPDIR=../../.. up_irqtest.ihx + @$(MAKE) TOPDIR=../../.. up_irqtest.ihx # Build dependencies diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index c7b4d86e644..22327afc0b5 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/src/Makefile # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -99,7 +99,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile index 0086602c020..531a2100d99 100644 --- a/arch/avr/src/Makefile +++ b/arch/avr/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # arch/avr/src/Makefile # -# Copyright (C) 2010 Gregory Nutt. All rights reserved. +# Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -102,7 +102,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile index 349fba21180..d33dcc84894 100755 --- a/arch/hc/src/Makefile +++ b/arch/hc/src/Makefile @@ -100,7 +100,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" diff --git a/arch/sh/src/Makefile b/arch/sh/src/Makefile index 5c1e91a62dc..62b72133ee9 100644 --- a/arch/sh/src/Makefile +++ b/arch/sh/src/Makefile @@ -77,7 +77,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile index 56577146293..b9436527695 100644 --- a/arch/x86/src/Makefile +++ b/arch/x86/src/Makefile @@ -97,7 +97,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "LD: nuttx$(EXEEXT)" diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile index 229ca14dc55..86ab8d9181d 100644 --- a/arch/z16/src/Makefile +++ b/arch/z16/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # arch/z16/src/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ WARCHSRCDIR = $(ARCHSRCDIR) USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR) -I$(ARCHSRCDIR)/common endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) -CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) +CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS += -I$(ARCHSRCDIR) ifeq ($(COMPILER),zneocc.exe) LDFLAGS = @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" @@ -93,7 +93,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) ifeq ($(COMPILER),zneocc.exe) nuttx.linkcmd: $(LINKCMDTEMPLATE) diff --git a/arch/z80/src/Makefile.sdcc b/arch/z80/src/Makefile.sdcc index cf7ae9dfe03..bc5e4aa7989 100644 --- a/arch/z80/src/Makefile.sdcc +++ b/arch/z80/src/Makefile.sdcc @@ -1,7 +1,7 @@ ############################################################################ # arch/z80/src/Makefile.sdcc # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -139,7 +139,7 @@ libarch$(LIBEXT): up_mem.h asm_mem.h $(OBJS) # This builds the libboard library in the board/ subdirectory board/libboard$(LIBEXT): - $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) # This target builds the final executable diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii index 4cda67369d5..51db8771d49 100644 --- a/arch/z80/src/Makefile.zdsii +++ b/arch/z80/src/Makefile.zdsii @@ -1,7 +1,7 @@ ############################################################################ # arch/z16/src/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) -CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) +CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS += -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR) LDFLAGS = @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" @@ -88,7 +88,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx.linkcmd: $(LINKCMDTEMPLATE) @cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd