diff options
| author | Raimo Niskanen <[email protected]> | 2012-01-11 18:33:19 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-01-23 16:58:41 +0100 |
| commit | ec052cc7adda144d6233f38e665850bb20ff0e0e (patch) | |
| tree | df019abe9b5c0b4714775de24cfc0fb62d363540 /erts/lib_src | |
| parent | 6fafcdcbe96d1f67d57715011acd1bb0ca858949 (diff) | |
| download | otp-ec052cc7adda144d6233f38e665850bb20ff0e0e.tar.gz otp-ec052cc7adda144d6233f38e665850bb20ff0e0e.tar.bz2 otp-ec052cc7adda144d6233f38e665850bb20ff0e0e.zip | |
erts: Fix dependencies between targets generate and depend
* Make generate and depend.mk automatically.
* Do not make depend.mk for targets clean and generate.
* Remove old replaced CREATE_DIRS cruft.
* Fiercer remove by target clean.
* Move depend.mk to Target/Type/Flavor directory.
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in index e427ecf312..ea80e74100 100644 --- a/erts/lib_src/Makefile.in +++ b/erts/lib_src/Makefile.in @@ -514,8 +514,6 @@ clean: $(RM) -rf ../lib/internal/$(TARGET)/* $(RM) -rf ../lib/$(TARGET)/* $(RM) -rf obj/$(TARGET)/* - $(RM) -f $(TARGET)/depend.mk - $(RM) -f $(OBJ_DIR)/erts_lib # # Make dependencies @@ -557,10 +555,11 @@ SED_MDd_DEPEND=sed '$(SED_PREFIX)$(SED_REPL_MDd_O);$(SED_REPL_TT_DIR);$(SED_REPL SED_MT_DEPEND=sed '$(SED_PREFIX)$(SED_REPL_MT_O);$(SED_REPL_TT_DIR);$(SED_REPL_TARGET)' SED_MTd_DEPEND=sed '$(SED_PREFIX)$(SED_REPL_MTd_O);$(SED_REPL_TT_DIR);$(SED_REPL_TARGET)' -DEPEND_MK=$(TARGET)/depend.mk +DEPEND_MK=$(OBJ_DIR)/depend.mk .PHONY: depend -depend: +depend: $(DEPEND_MK) +$(DEPEND_MK): @echo "Generating dependency file $(DEPEND_MK)..." @echo "# Generated dependency rules" > $(DEPEND_MK); @echo "# " >> $(DEPEND_MK); @@ -633,6 +632,8 @@ endif endif @echo "# EOF" >> $(DEPEND_MK); +ifneq ($(MAKECMDGOALS),clean) -include $(DEPEND_MK) +endif # eof |