Revert "Don't generate .depend anymore"

This reverts commit cc5ad09caabd31b1efe02fb80cf811f698d9ac63.
This commit is contained in:
Xiang Xiao 2020-03-23 11:33:08 +08:00
parent f074d7f376
commit 1511403fdf
254 changed files with 266 additions and 6 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.depend
Make.dep Make.dep
*.o *.o
*.a *.a

View File

@ -219,14 +219,15 @@ else
context:: context::
endif endif
Make.dep: Makefile $(SRCS) .depend: Makefile $(SRCS)
ifeq ($(filter %$(CXXEXT),$(SRCS)),) ifeq ($(filter %$(CXXEXT),$(SRCS)),)
$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$^) >$@ $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$^) >Make.dep
else else
$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$^) >$@ $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$^) >Make.dep
endif endif
$(Q) touch $@
depend:: Make.dep depend:: .depend
clean:: clean::
$(call DELFILE, .built) $(call DELFILE, .built)
@ -234,5 +235,6 @@ clean::
distclean:: clean distclean:: clean
$(call DELFILE, Make.dep) $(call DELFILE, Make.dep)
$(call DELFILE, .depend)
-include Make.dep -include Make.dep

View File

@ -58,7 +58,7 @@ SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
# Build targets # Build targets
all: $(BIN) all: $(BIN)
.PHONY: import install dirlinks context context_serialize clean_context context_rest export preconfig depend clean distclean .PHONY: import install dirlinks context context_serialize clean_context context_rest export .depdirs preconfig depend clean distclean
.PRECIOUS: $(BIN) .PRECIOUS: $(BIN)
$(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all)))
@ -145,7 +145,12 @@ ifneq ($(BUILTIN_REGISTRY),)
endif endif
endif endif
depend: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend) .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend)
.depend: Makefile .depdirs
$(Q) touch $@
depend: .depend
clean_context: clean_context:
$(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
@ -174,6 +179,7 @@ else
) )
endif endif
$(call DELFILE, *.lock) $(call DELFILE, *.lock)
$(call DELFILE, .depend)
$(call DELFILE, $(SYMTABSRC)) $(call DELFILE, $(SYMTABSRC))
$(call DELFILE, $(SYMTABOBJ)) $(call DELFILE, $(SYMTABOBJ))
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))

1
builtin/.gitignore vendored
View File

@ -1,4 +1,5 @@
/.context /.context
/.depend
/.built /.built
/Make.dep /Make.dep
/builtin_list.h /builtin_list.h

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/Make.dep /Make.dep
/.context /.context
/.depend
/.built /.built
/*.asm /*.asm
/*.rel /*.rel

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/romfs.img /romfs.img
/romfs.h /romfs.h

View File

@ -1,5 +1,6 @@
/hello /hello
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/bridge_config.h /bridge_config.h
/host1 /host1

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/hello /hello
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.o1 /*.o1
/*.asm /*.asm

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/Make.dep /Make.dep
/.context /.context
/.depend
/.built /.built
/*.asm /*.asm
/*.rel /*.rel

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,2 +1,3 @@
/Make.dep /Make.dep
/.depend
/.built /.built

View File

@ -1,5 +1,6 @@
/hello /hello
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/config.h /config.h

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/hello /hello
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/*.asm /*.asm

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/hello /hello
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/*.asm /*.asm

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,2 +1,3 @@
/Make.dep /Make.dep
/.depend
/.built /.built

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/hello /hello
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/*.asm /*.asm

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/config.h /config.h

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,5 +1,6 @@
/Make.dep /Make.dep
/.context /.context
/.depend
/.built /.built
/*.asm /*.asm
/*.rel /*.rel

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,2 +1,3 @@
/Make.dep /Make.dep
/.depend
/.built /.built

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.rel /*.rel

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/*.asm /*.asm

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/host /host
/*.asm /*.asm

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

View File

@ -1,4 +1,5 @@
/Make.dep /Make.dep
/.depend
/.built /.built
/*.asm /*.asm
/*.obj /*.obj

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