summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-16 14:13:04 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-16 14:13:04 +0000
commit47266483f9718a45f71626259356d481e89dd2a7 (patch)
treea323c59149de803ee3d1363c1a03a5b8e24fff0c /nuttx/arch
parent5005a9f2ff8fa5549de72c10067753da303f210e (diff)
downloadpx4-nuttx-47266483f9718a45f71626259356d481e89dd2a7.tar.gz
px4-nuttx-47266483f9718a45f71626259356d481e89dd2a7.tar.bz2
px4-nuttx-47266483f9718a45f71626259356d481e89dd2a7.zip
Mostly cosmetic build changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5362 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/8051/src/Makefile40
-rw-r--r--nuttx/arch/arm/src/Makefile10
-rw-r--r--nuttx/arch/z16/src/Makefile34
3 files changed, 42 insertions, 42 deletions
diff --git a/nuttx/arch/8051/src/Makefile b/nuttx/arch/8051/src/Makefile
index 0f1b1b857..4772834d9 100644
--- a/nuttx/arch/8051/src/Makefile
+++ b/nuttx/arch/8051/src/Makefile
@@ -153,44 +153,44 @@ libarch$(LIBEXT): up_mem.h $(OBJS)
# This is a kludge to work around some conflicting symbols in libsdcc.liXqueb
$(SDCCLIBDIR)/libmysdcc.lib: $(SDCCLIBDIR)/libsdcc.lib
- @cat $(SDCCLIBDIR)/libsdcc.lib | \
+ $(Q) cat $(SDCCLIBDIR)/libsdcc.lib | \
grep -v calloc | grep -v malloc | grep -v realloc | \
grep -v free | grep -v vprintf | grep -v _strncpy | \
grep -v _strchr | grep -v _strlen | grep -v _strcmp | \
grep -v _strcpy | grep -v _memcmp | grep -v _memcpy | \
grep -v _memset \
> libmysdcc.lib
- @mv -f libmysdcc.lib $(SDCCLIBDIR)/libmysdcc.lib
+ $(Q) mv -f libmysdcc.lib $(SDCCLIBDIR)/libmysdcc.lib
# This builds the libboard library in the board/ subdirectory
board/libboard$(LIBEXT):
- $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
+ $(Q) $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
# This target builds the final executable
pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT)
@echo "LD: $@"
- @"$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
+ $(Q) "$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
- @rm -f up_mem.h
- @rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT)
- @$(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT)
+ $(Q) rm -f up_mem.h
+ $(Q) rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT)
+ $(Q) $(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT)
nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS)
@echo "LD: $@"
- @"$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
+ $(Q) "$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
nuttx$(EXEEXT): pass1.hex nuttx.hex
- @rm -f pass1.*
- @packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
- @cp -f nuttx.map $(TOPDIR)/.
+ $(Q) rm -f pass1.*
+ $(Q) packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
+ $(Q) cp -f nuttx.map $(TOPDIR)/.
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
- @if [ -d "$(EXPORT_DIR)/startup" ]; then \
+ $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f up_head$(OBJEXT) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
@@ -201,31 +201,31 @@ export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
# a PHONY target that just sets upt the up_irqtest build correctly
up_irqtest.hex: $(TESTOBJS)
- "$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
+ $(Q) "$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
irqtest:
- @$(MAKE) TOPDIR=../../.. up_irqtest.hex
+ $(Q) $(MAKE) TOPDIR=../../.. up_irqtest.hex
# Build dependencies
.depend: Makefile up_mem.h $(DEPSRCS)
- @if [ -e board/Makefile ]; then \
+ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \
fi
- @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
- @touch $@
+ $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+ $(Q) touch $@
depend: .depend
clean:
- @if [ -e board/Makefile ]; then \
+ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
fi
- @rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp
+ $(Q) rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp
$(call CLEAN)
distclean: clean
- @if [ -e board/Makefile ]; then \
+ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \
fi
rm -f Make.dep .depend
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile
index ba506d4da..a48d18799 100644
--- a/nuttx/arch/arm/src/Makefile
+++ b/nuttx/arch/arm/src/Makefile
@@ -155,11 +155,11 @@ endif
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
ifneq ($(HEAD_OBJ),)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
- cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
+ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
else \
- echo "$(EXPORT_DIR)/startup does not exist"; \
+ echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \
- fi
+ fi
endif
# Dependencies
@@ -176,14 +176,14 @@ depend: .depend
clean:
ifeq ($(BOARDMAKE),y)
- $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN)
distclean: clean
ifeq ($(BOARDMAKE),y)
- $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif
$(Q) rm -f Make.dep .depend
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile
index a2a441f74..44f96d03d 100644
--- a/nuttx/arch/z16/src/Makefile
+++ b/nuttx/arch/z16/src/Makefile
@@ -49,7 +49,7 @@ INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPFLAGS += -I$(ARCHSRCDIR)
ifeq ($(COMPILER),zneocc.exe)
-LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
+LDFLAGS += "${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
endif
HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT))
@@ -73,9 +73,9 @@ all: $(HEAD_OBJ) libarch$(LIBEXT)
ifeq ($(COMPILER),zneocc.exe)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
- @$(CPP) $(CPPFLAGS) $< -o $@.tmp
- @cat $@.tmp | sed -e "s/^#/;/g" > $@
- @rm $@.tmp
+ $(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp
+ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
+ $(Q) rm $@.tmp
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@)
@@ -91,14 +91,14 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
ifeq ($(COMPILER),zneocc.exe)
nuttx.linkcmd: $(LINKCMDTEMPLATE)
- @cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
+ $(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
@echo "\"${shell cygpath -w $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_OBJ)}\", \\" >>nuttx.linkcmd
- @( for lib in $(LINKLIBS); do \
+ $(Q) ( for lib in $(LINKLIBS); do \
echo " \"`cygpath -w $(TOPDIR)/lib/$${lib}`\", \\" >>nuttx.linkcmd; \
done ; )
@echo " \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\" >>nuttx.linkcmd
@@ -110,19 +110,19 @@ endif
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
@echo "LD: nuttx$(EXEEXT)"
- @$(LD) $(LDFLAGS)
+ $(Q) $(LD) $(LDFLAGS)
.depend: Makefile chip/Make.defs $(DEPSRCS)
- @if [ -e board/Makefile ]; then \
+ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi
- @$(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
- @touch $@
+ $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
+ $(Q) touch $@
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
- @if [ -d "$(EXPORT_DIR)/startup" ]; then \
+ $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
@@ -134,19 +134,19 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
depend: .depend
clean:
- @if [ -e board/Makefile ]; then \
+ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
fi
- @rm -f libarch$(LIBEXT) *~ .*.swp
+ $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
ifeq ($(COMPILER),zneocc.exe)
- @rm -f nuttx.linkcmd *.asm *.tmp *.map
+ $(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map
endif
$(call CLEAN)
distclean: clean
- @if [ -e board/Makefile ]; then \
+ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
fi
- @rm -f Make.dep .depend
+ $(Q) rm -f Make.dep .depend
-include Make.dep