Mostly cosmetic build changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5362 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
76f2745323
commit
35e380ac6d
@ -368,26 +368,26 @@ endif
|
||||
# Link the arch/<arch-name>/include directory to include/arch
|
||||
|
||||
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
|
||||
|
||||
# Link the configs/<board-name>/include directory to include/arch/board
|
||||
|
||||
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
|
||||
|
||||
# Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
|
||||
|
||||
$(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
|
||||
|
||||
# Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip
|
||||
|
||||
$(ARCH_SRC)/chip: Make.defs
|
||||
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
|
||||
endif
|
||||
|
||||
@ -395,7 +395,7 @@ endif
|
||||
|
||||
include/arch/chip: include/arch Make.defs
|
||||
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
|
||||
endif
|
||||
|
||||
|
||||
12
Makefile.win
12
Makefile.win
@ -69,7 +69,7 @@ BOARD_DIR = configs\$(CONFIG_ARCH_BOARD)
|
||||
ifeq ($(CONFIG_APPS_DIR),)
|
||||
CONFIG_APPS_DIR = ..\apps
|
||||
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.
|
||||
#
|
||||
@ -364,7 +364,7 @@ endif
|
||||
# Link the arch\<arch-name>\include directory to include\arch
|
||||
|
||||
include\arch: Make.defs
|
||||
@echo "LN: include\arch -> $(TOPDIR)\$(ARCH_DIR)\include"
|
||||
@echo "LN: include\arch -> $(ARCH_DIR)\include"
|
||||
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
|
||||
$(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include
|
||||
else
|
||||
@ -375,7 +375,7 @@ endif
|
||||
# Link the configs\<board-name>\include directory to include\arch\board
|
||||
|
||||
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)
|
||||
$(Q) /user:administrator mklink /d include\arch\board $(TOPDIR)\$(BOARD_DIR)\include
|
||||
else
|
||||
@ -386,7 +386,7 @@ endif
|
||||
# Link the configs\<board-name>\src dir to arch\<arch-name>\src\board
|
||||
|
||||
$(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)
|
||||
$(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(TOPDIR)\$(BOARD_DIR)\src
|
||||
else
|
||||
@ -398,7 +398,7 @@ endif
|
||||
|
||||
$(ARCH_SRC)\chip: Make.defs
|
||||
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)
|
||||
$(Q) /user:administrator mklink /d $(ARCH_SRC)\chip $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP)
|
||||
else
|
||||
@ -411,7 +411,7 @@ endif
|
||||
|
||||
include\arch\chip: include\arch Make.defs
|
||||
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)
|
||||
$(Q) /user:administrator mklink /d include\arch\chip $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP)
|
||||
else
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user