fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 01:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mostly cosmetic build changes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5362 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-16 14:13:04 +00:00
parent da3dd04ea5
commit 8b823f6bee
10 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/examples/Makefile
+1 -1
View File
@@ -104,7 +104,7 @@ all: nothing
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef endef
$(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context))) $(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
apps/graphics/Makefile
+1 -1
View File
@@ -48,7 +48,7 @@ all: nothing
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef endef
$(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context))) $(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
apps/interpreters/Makefile
+1 -1
View File
@@ -52,7 +52,7 @@ all: nothing
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef endef
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend))) $(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
apps/netutils/Makefile
+1 -1
View File
@@ -49,7 +49,7 @@ all: nothing
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef endef
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
apps/system/Makefile
+1 -1
View File
@@ -58,7 +58,7 @@ all: nothing
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef endef
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend))) $(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
nuttx/Makefile.unix
+5 -5
View File
@@ -368,26 +368,26 @@ endif
# Link the arch/<arch-name>/include directory to include/arch # Link the arch/<arch-name>/include directory to include/arch
include/arch: Make.defs include/arch: Make.defs
@echo "LN: include/arch -> $(TOPDIR)/$(ARCH_DIR)/include" @echo "LN: include/arch -> $(ARCH_DIR)/include"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch $(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch
# Link the configs/<board-name>/include directory to include/arch/board # Link the configs/<board-name>/include directory to include/arch/board
include/arch/board: include/arch Make.defs include/arch include/arch/board: include/arch Make.defs include/arch
@echo "LN: include/arch/board -> $(TOPDIR)/$(BOARD_DIR)/include" @echo "LN: include/arch/board -> $(BOARD_DIR)/include"
$(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/include include/arch/board $(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/include include/arch/board
# Link the configs/<board-name>/src dir to arch/<arch-name>/src/board # Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
$(ARCH_SRC)/board: Make.defs $(ARCH_SRC)/board: Make.defs
@echo "LN: $(ARCH_SRC)/board -> $(TOPDIR)/$(BOARD_DIR)/src" @echo "LN: $(ARCH_SRC)/board -> $(BOARD_DIR)/src"
$(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/src $(ARCH_SRC)/board $(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/src $(ARCH_SRC)/board
# Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip # Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip
$(ARCH_SRC)/chip: Make.defs $(ARCH_SRC)/chip: Make.defs
ifneq ($(CONFIG_ARCH_CHIP),) ifneq ($(CONFIG_ARCH_CHIP),)
@echo "LN: $(ARCH_SRC)/chip -> $(TOPDIR)\$(ARCH_SRC)/$(CONFIG_ARCH_CHIP)" @echo "LN: $(ARCH_SRC)/chip -> $(ARCH_SRC)/$(CONFIG_ARCH_CHIP)"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_SRC)/$(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip $(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_SRC)/$(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip
endif endif
@@ -395,7 +395,7 @@ endif
include/arch/chip: include/arch Make.defs include/arch/chip: include/arch Make.defs
ifneq ($(CONFIG_ARCH_CHIP),) ifneq ($(CONFIG_ARCH_CHIP),)
@echo "LN: include/arch/chip -> $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP)" @echo "LN: include/arch/chip -> $(ARCH_INC)/$(CONFIG_ARCH_CHIP)"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip $(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip
endif endif
nuttx/Makefile.win
+6 -6
View File
@@ -69,7 +69,7 @@ BOARD_DIR = configs\$(CONFIG_ARCH_BOARD)
ifeq ($(CONFIG_APPS_DIR),) ifeq ($(CONFIG_APPS_DIR),)
CONFIG_APPS_DIR = ..\apps CONFIG_APPS_DIR = ..\apps
endif endif
APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo "$(CONFIG_APPS_DIR)"} APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo $(CONFIG_APPS_DIR)}
# All add-on directories. # All add-on directories.
# #
@@ -364,7 +364,7 @@ endif
# Link the arch\<arch-name>\include directory to include\arch # Link the arch\<arch-name>\include directory to include\arch
include\arch: Make.defs include\arch: Make.defs
@echo "LN: include\arch -> $(TOPDIR)\$(ARCH_DIR)\include" @echo "LN: include\arch -> $(ARCH_DIR)\include"
ifeq ($(CONFIG_WINDOWS_MKLINK),y) ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include $(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include
else else
@@ -375,7 +375,7 @@ endif
# Link the configs\<board-name>\include directory to include\arch\board # Link the configs\<board-name>\include directory to include\arch\board
include\arch\board: include\arch Make.defs include\arch include\arch\board: include\arch Make.defs include\arch
@echo "LN: include\arch\board -> $(TOPDIR)\$(BOARD_DIR)\include" @echo "LN: include\arch\board -> $(BOARD_DIR)\include"
ifeq ($(CONFIG_WINDOWS_MKLINK),y) ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch\board $(TOPDIR)\$(BOARD_DIR)\include $(Q) /user:administrator mklink /d include\arch\board $(TOPDIR)\$(BOARD_DIR)\include
else else
@@ -386,7 +386,7 @@ endif
# Link the configs\<board-name>\src dir to arch\<arch-name>\src\board # Link the configs\<board-name>\src dir to arch\<arch-name>\src\board
$(ARCH_SRC)\board: Make.defs $(ARCH_SRC)\board: Make.defs
@echo "LN: $(ARCH_SRC)\board -> $(TOPDIR)\$(BOARD_DIR)\src" @echo "LN: $(ARCH_SRC)\board -> $(BOARD_DIR)\src"
ifeq ($(CONFIG_WINDOWS_MKLINK),y) ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(TOPDIR)\$(BOARD_DIR)\src $(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(TOPDIR)\$(BOARD_DIR)\src
else else
@@ -398,7 +398,7 @@ endif
$(ARCH_SRC)\chip: Make.defs $(ARCH_SRC)\chip: Make.defs
ifneq ($(CONFIG_ARCH_CHIP),) ifneq ($(CONFIG_ARCH_CHIP),)
@echo "LN: $(ARCH_SRC)\chip -> $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP)" @echo "LN: $(ARCH_SRC)\chip -> $(ARCH_SRC)\$(CONFIG_ARCH_CHIP)"
ifeq ($(CONFIG_WINDOWS_MKLINK),y) ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d $(ARCH_SRC)\chip $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP) $(Q) /user:administrator mklink /d $(ARCH_SRC)\chip $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP)
else else
@@ -411,7 +411,7 @@ endif
include\arch\chip: include\arch Make.defs include\arch\chip: include\arch Make.defs
ifneq ($(CONFIG_ARCH_CHIP),) ifneq ($(CONFIG_ARCH_CHIP),)
@echo "LN: include\arch\chip -> $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP)" @echo "LN: include\arch\chip -> $(ARCH_INC)\$(CONFIG_ARCH_CHIP)"
ifeq ($(CONFIG_WINDOWS_MKLINK),y) ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch\chip $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP) $(Q) /user:administrator mklink /d include\arch\chip $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP)
else else
nuttx/arch/8051/src/Makefile
+20 -20
View File
@@ -153,44 +153,44 @@ libarch$(LIBEXT): up_mem.h $(OBJS)
# This is a kludge to work around some conflicting symbols in libsdcc.liXqueb # This is a kludge to work around some conflicting symbols in libsdcc.liXqueb
$(SDCCLIBDIR)/libmysdcc.lib: $(SDCCLIBDIR)/libsdcc.lib $(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 calloc | grep -v malloc | grep -v realloc | \
grep -v free | grep -v vprintf | grep -v _strncpy | \ grep -v free | grep -v vprintf | grep -v _strncpy | \
grep -v _strchr | grep -v _strlen | grep -v _strcmp | \ grep -v _strchr | grep -v _strlen | grep -v _strcmp | \
grep -v _strcpy | grep -v _memcmp | grep -v _memcpy | \ grep -v _strcpy | grep -v _memcmp | grep -v _memcpy | \
grep -v _memset \ grep -v _memset \
> libmysdcc.lib > 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 # This builds the libboard library in the board/ subdirectory
board/libboard$(LIBEXT): 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 # This target builds the final executable
pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT) pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT)
@echo "LD: $@" @echo "LD: $@"
@"$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ $(Q) "$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
@rm -f up_mem.h $(Q) rm -f up_mem.h
@rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT) $(Q) rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT)
@$(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT) $(Q) $(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT)
nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS)
@echo "LD: $@" @echo "LD: $@"
@"$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ $(Q) "$(CC)" $(LDFLAGS) $(LIBPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
nuttx$(EXEEXT): pass1.hex nuttx.hex nuttx$(EXEEXT): pass1.hex nuttx.hex
@rm -f pass1.* $(Q) rm -f pass1.*
@packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT) $(Q) packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
@cp -f nuttx.map $(TOPDIR)/. $(Q) cp -f nuttx.map $(TOPDIR)/.
# This is part of the top-level export target # This is part of the top-level export target
export_head: board/libboard$(LIBEXT) p_head$(OBJEXT) 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"; \ cp -f up_head$(OBJEXT) "$(EXPORT_DIR)/startup"; \
else \ else \
echo "$(EXPORT_DIR)/startup does not exist"; \ 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 # a PHONY target that just sets upt the up_irqtest build correctly
up_irqtest.hex: $(TESTOBJS) up_irqtest.hex: $(TESTOBJS)
"$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@ $(Q) "$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
irqtest: irqtest:
@$(MAKE) TOPDIR=../../.. up_irqtest.hex $(Q) $(MAKE) TOPDIR=../../.. up_irqtest.hex
# Build dependencies # Build dependencies
.depend: Makefile up_mem.h $(DEPSRCS) .depend: Makefile up_mem.h $(DEPSRCS)
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \
fi fi
@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \ $(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
fi fi
@rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp $(Q) rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \ $(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \
fi fi
rm -f Make.dep .depend rm -f Make.dep .depend
nuttx/arch/arm/src/Makefile
+5 -5
View File
@@ -155,11 +155,11 @@ endif
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
ifneq ($(HEAD_OBJ),) ifneq ($(HEAD_OBJ),)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \ $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
else \ else \
echo "$(EXPORT_DIR)/startup does not exist"; \ echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \ exit 1; \
fi fi
endif endif
# Dependencies # Dependencies
@@ -176,14 +176,14 @@ depend: .depend
clean: clean:
ifeq ($(BOARDMAKE),y) ifeq ($(BOARDMAKE),y)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifeq ($(BOARDMAKE),y) ifeq ($(BOARDMAKE),y)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
nuttx/arch/z16/src/Makefile
+17 -17
View File
@@ -49,7 +49,7 @@ INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPFLAGS += -I$(ARCHSRCDIR) CPPFLAGS += -I$(ARCHSRCDIR)
ifeq ($(COMPILER),zneocc.exe) ifeq ($(COMPILER),zneocc.exe)
LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" LDFLAGS += "${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
endif endif
HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT)) HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT))
@@ -73,9 +73,9 @@ all: $(HEAD_OBJ) libarch$(LIBEXT)
ifeq ($(COMPILER),zneocc.exe) ifeq ($(COMPILER),zneocc.exe)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) $< -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT) $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@@ -91,14 +91,14 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT): 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) ifeq ($(COMPILER),zneocc.exe)
nuttx.linkcmd: $(LINKCMDTEMPLATE) 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 $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_OBJ)}\", \\" >>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; \ echo " \"`cygpath -w $(TOPDIR)/lib/$${lib}`\", \\" >>nuttx.linkcmd; \
done ; ) done ; )
@echo " \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\" >>nuttx.linkcmd @echo " \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\" >>nuttx.linkcmd
@@ -110,19 +110,19 @@ endif
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
@echo "LD: nuttx$(EXEEXT)" @echo "LD: nuttx$(EXEEXT)"
@$(LD) $(LDFLAGS) $(Q) $(LD) $(LDFLAGS)
.depend: Makefile chip/Make.defs $(DEPSRCS) .depend: Makefile chip/Make.defs $(DEPSRCS)
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi fi
@$(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
@touch $@ $(Q) touch $@
# This is part of the top-level export target # This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) 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"; \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
else \ else \
echo "$(EXPORT_DIR)/startup does not exist"; \ echo "$(EXPORT_DIR)/startup does not exist"; \
@@ -134,19 +134,19 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
fi fi
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
ifeq ($(COMPILER),zneocc.exe) ifeq ($(COMPILER),zneocc.exe)
@rm -f nuttx.linkcmd *.asm *.tmp *.map $(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map
endif endif
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
fi fi
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep