Revert "Don't generate .depend anymore"

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
+2
View File
@@ -1,3 +1,4 @@
.depend
Make.dep
*.o
*.a
@@ -12,6 +13,7 @@ core
.cproject
cscope.out
/Make.dep
/.depend
/*.asm
/*.obj
/*.rel
+7 -5
View File
@@ -119,17 +119,18 @@ ifneq ($(CXXOBJS),)
$(call ARCHIVE, $@, $(CXXOBJS))
endif
Make.dep: Makefile $(SRCS) $(CXXSRCS)
.depend: Makefile $(SRCS) $(CXXSRCS)
ifneq ($(ZDSVERSION),)
$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >$@
$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
else
$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >$@
$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
endif
ifneq ($(CXXSRCS),)
$(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(CXXSRCS) >>$@
$(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(CXXSRCS) >>Make.dep
endif
$(Q) touch $@
depend: Make.dep
depend: .depend
ifneq ($(BOARD_CONTEXT),y)
context:
@@ -142,6 +143,7 @@ clean:
distclean: clean
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
$(EXTRA_DISTCLEAN)
-include Make.dep
+6 -4
View File
@@ -103,15 +103,16 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
$(BIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
Make.dep: Makefile $(SRCS)
.depend: Makefile $(SRCS)
ifneq ($(SRCS),)
$(Q) $(MKDEP) --dep-path . "$(CC)" -- $(CFLAGS) -- $(SRCS) >$@
$(Q) $(MKDEP) --dep-path . "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
endif
ifneq ($(CXXSRCS),)
$(Q) $(MKDEP) --dep-path . "$(CXX)" -- $(CXXFLAGS) -- $(CXXSRCS) >>$@
$(Q) $(MKDEP) --dep-path . "$(CXX)" -- $(CXXFLAGS) -- $(CXXSRCS) >>Make.dep
endif
$(Q) touch $@
depend: Make.dep
depend: .depend
$(DUMMY_KCONFIG): $(BOARD_KCONFIG)
$(call DELFILE, $(DUMMY_KCONFIG))
@@ -133,5 +134,6 @@ clean: clean_context
distclean: clean
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
-include Make.dep
+1
View File
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,3 @@
/.depend
/Make.dep
src/.depend
@@ -109,7 +109,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -109,7 +109,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
+1
View File
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -111,7 +111,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) -n nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -109,7 +109,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -109,7 +109,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -109,7 +109,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -114,7 +114,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
+3 -1
View File
@@ -97,7 +97,9 @@ locked.r: ld-locked.inc $(PASS1_LIBBOARD)
$(PASS1_SRCDIR)$(DELIM)locked.r: locked.r
$(Q) cp -a locked.r $(TOPDIR)$(DELIM)$(PASS1_SRCDIR)$(DELIM)locked.r
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, locked.r)
+1
View File
@@ -1 +1,2 @@
/.depend
/Make.dep
+1
View File
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -109,7 +109,9 @@ $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
$(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
$(Q) $(CROSSDEV)size nuttx_user.elf
depend:
.depend:
depend: .depend
clean:
$(call DELFILE, nuttx_user.elf)
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep
@@ -1 +1,2 @@
/.depend
/Make.dep

Some files were not shown because too many files have changed in this diff Show More