Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove bash fragments that test for board/Makefile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5334 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-11 14:36:01 +00:00
parent 9b822f3086
commit 31fcfae567
6 changed files with 197 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/Makefile
+26 -11
View File
@@ -33,6 +33,7 @@
# #
############################################################################ ############################################################################
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
-include chip/Make.defs -include chip/Make.defs
@@ -76,18 +77,32 @@ EXTRA_LIBS ?=
EXTRA_LIBPATHS ?= EXTRA_LIBPATHS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"(TOPDIR)/lib"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(BOARDDIR)"
endif endif
endif
endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
GCC_LIBDIR := ${shell dirname $(LIBGCC)} GCC_LIBDIR := ${shell dirname $(LIBGCC)}
@@ -137,9 +152,9 @@ endif
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
$(Q) if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
fi endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
@@ -147,16 +162,16 @@ endif
depend: .depend depend: .depend
clean: clean:
$(Q) if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
fi endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
$(Q) if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
fi endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
arch/avr/src/Makefile
+34 -19
View File
@@ -78,17 +78,32 @@ LDFLAGS += $(ARCHSCRIPT)
EXTRA_LIBS ?= EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"(TOPDIR)/lib"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(BOARDDIR)"
endif endif
endif
endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
@@ -105,25 +120,25 @@ $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
libarch$(LIBEXT): $(OBJS) libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \ $(Q) ( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )
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)
nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx" @echo "LD: nuttx"
@$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \
--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
@$(NM) $(NUTTX)$(EXEEXT) | \ $(Q) $(NM) $(NUTTX)$(EXEEXT) | \
grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map sort > $(TOPDIR)/System.map
# 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"; \
@@ -133,27 +148,27 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
fi endif
@$(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
fi endif
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
fi endif
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
arch/hc/src/Makefile
+35 -21
View File
@@ -71,18 +71,32 @@ LDFLAGS += $(ARCHSCRIPT)
EXTRA_LIBS ?= EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"(TOPDIR)/lib"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(BOARDDIR)"
endif endif
endif
endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
VPATH = chip:common:$(ARCH_SUBDIR) VPATH = chip:common:$(ARCH_SUBDIR)
@@ -97,25 +111,25 @@ $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
libarch$(LIBEXT): $(OBJS) libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \ $(Q) ( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )
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)
nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx" $(Q) echo "LD: nuttx"
@$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) \ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) \
--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
@$(NM) $(NUTTX)$(EXEEXT) | \ $(Q) $(NM) $(NUTTX)$(EXEEXT) | \
grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map sort > $(TOPDIR)/System.map
# 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"; \
@@ -125,26 +139,26 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
fi endif
@$(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
fi endif
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
fi endif
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
arch/mips/src/Makefile
+34 -20
View File
@@ -68,18 +68,32 @@ LDFLAGS += $(ARCHSCRIPT)
EXTRA_LIBS ?= EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"(TOPDIR)/lib"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(BOARDDIR)"
endif endif
endif
endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
VPATH = chip:common:$(ARCH_SUBDIR) VPATH = chip:common:$(ARCH_SUBDIR)
@@ -95,25 +109,25 @@ $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
libarch$(LIBEXT): $(OBJS) libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \ $(Q) ( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )
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)
nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx" @echo "LD: nuttx"
@$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \
--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
@$(NM) $(NUTTX)$(EXEEXT) | \ $(Q) $(NM) $(NUTTX)$(EXEEXT) | \
grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map sort > $(TOPDIR)/System.map
# 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"; \
@@ -123,26 +137,26 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
fi endif
@$(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
fi endif
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
fi endif
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
arch/sh/src/Makefile
+34 -20
View File
@@ -54,18 +54,32 @@ LDFLAGS += $(ARCHSCRIPT)
EXTRA_LIBS ?= EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"(TOPDIR)/lib"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(BOARDDIR)"
endif endif
endif
endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name} LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}
VPATH = chip:common VPATH = chip:common
@@ -81,25 +95,25 @@ $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
libarch$(LIBEXT): $(OBJS) libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \ $(Q) ( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )
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)
nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx" @echo "LD: nuttx"
@$(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_OBJ) \ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_OBJ) \
--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
@$(NM) $(TOPDIR)/$@ | \ $(Q) $(NM) $(TOPDIR)/$@ | \
grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map sort > $(TOPDIR)/System.map
# 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"; \
@@ -109,25 +123,25 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
fi endif
@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
fi endif
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
fi endif
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
arch/x86/src/Makefile
+34 -20
View File
@@ -68,18 +68,32 @@ LDFLAGS += $(ARCHSCRIPT)
EXTRA_LIBS ?= EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"(TOPDIR)/lib"
ifneq ($(BOARDDIR),)
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(BOARDDIR)"
endif endif
endif
endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
ifeq ($(HOSTOS),FreeBSD) ifeq ($(HOSTOS),FreeBSD)
@@ -103,25 +117,25 @@ $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
libarch$(LIBEXT): $(OBJS) libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \ $(Q) ( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )
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)
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx$(EXEEXT)" @echo "LD: nuttx$(EXEEXT)"
@$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \
--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
@$(NM) $(NUTTX)$(EXEEXT) | \ $(Q) $(NM) $(NUTTX)$(EXEEXT) | \
grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map sort > $(TOPDIR)/System.map
# 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"; \
@@ -131,26 +145,26 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
fi endif
@$(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
fi endif
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ ifneq ($(BOARDDIR),)
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
fi endif
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep