Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Don't generate .depend anymore"

Browse Source 
This reverts commit 79af7fbf4e.

Because:

* btashton reported some issues in local builds:

  https://github.com/apache/incubator-nuttx/pull/603#issuecomment-602264860

* this might be related to the current CI breakage:

  > /bin/sh: 1: /__w/incubator-nuttx/incubator-nuttx/nuttx/tools/mkdeps: not found
This commit is contained in:
YAMAMOTO Takashi
2020-03-23 11:44:03 +09:00
committed by Xiang Xiao
parent 79af7fbf4e
commit 1ffa009c8b
231 changed files with 460 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z80/src/.gitignore
+1
View File
@@ -1,4 +1,5 @@
/Make.dep
/.depend
/up_mem.h
/asm_mem.h
/board
arch/z80/src/Makefile.sdccl
+5 -3
View File
@@ -208,13 +208,14 @@ export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
# Build dependencies
Make.dep: Makefile asm_mem.h chip/Make.defs $(DEPSRCS)
.depend: Makefile asm_mem.h chip/Make.defs $(DEPSRCS)
$(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >$@
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
$(Q) touch $@
depend: Make.dep
depend: .depend
clean:
$(Q) if [ -e board/Makefile ]; then \
@@ -230,5 +231,6 @@ distclean: clean
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
fi
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
-include Make.dep
arch/z80/src/Makefile.sdccw
+5 -3
View File
@@ -202,11 +202,12 @@ export_startup: board\libboard$(LIBEXT) $(STARTUP_OBJS)
# Build dependencies
Make.dep: Makefile asm_mem.h chip\Make.defs $(DEPSRCS)
.depend: Makefile asm_mem.h chip\Make.defs $(DEPSRCS)
$(Q) if exist board\Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" depend )
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >$@
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
$(Q) touch $@
depend: Make.dep
depend: .depend
clean:
$(Q) if exist board\Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" clean )
@@ -218,5 +219,6 @@ clean:
distclean: clean
$(Q) if exist board\Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean )
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
-include Make.dep
arch/z80/src/Makefile.zdsiil
+5 -3
View File
@@ -139,11 +139,12 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd
@echo "LD: nuttx$(EXEEXT)"
$(Q) "$(LD)" $(LDFLAGS)
Make.dep: Makefile chip$(DELIM)Make.defs $(DEPSRCS)
.depend: Makefile chip$(DELIM)Make.defs $(DEPSRCS)
$(Q) if [ -e board$(DELIM)Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >$@
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
$(Q) touch $@
# This is part of the top-level export target
@@ -157,7 +158,7 @@ export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
# Dependencies
depend: Make.dep
depend: .depend
clean:
$(Q) if [ -e board$(DELIM)Makefile ]; then \
@@ -175,5 +176,6 @@ distclean: clean
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
fi
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
-include Make.dep
arch/z80/src/Makefile.zdsiiw
+5 -3
View File
@@ -128,9 +128,10 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd
@echo "LD: nuttx$(EXEEXT)"
$(Q) "$(LD)" $(LDFLAGS)
Make.dep: Makefile chip$(DELIM)Make.defs $(DEPSRCS)
.depend: Makefile chip$(DELIM)Make.defs $(DEPSRCS)
$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" depend )
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >$@
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
$(Q) touch $@
# This is part of the top-level export target
@@ -139,7 +140,7 @@ export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
# Dependencies
depend: Make.dep
depend: .depend
clean:
$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" clean )
@@ -153,5 +154,6 @@ clean:
distclean: clean
$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean )
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
-include Make.dep