Commit 4a9a21b9 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Makefile: remove the graphs/ dir on 'make clean' 



Currently, a 'make clean' leaves the graphs/ subdirectory in the
output directory. This commit defines a GRAPHS_DIR variable, used by
the different graph-generating targets, and which gets cleaned up in
the 'clean' target.

[Thomas: use the new GRAPHS_DIR variable in more places, as suggested
by Yann.]

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b6b833e7

Makefile

+8 −7
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ TARGET_DIR := $(BASE_DIR)/target 
# initial definition so that 'make clean' works for most users, even without

# .config. HOST_DIR will be overwritten later when .config is included.

HOST_DIR := $(BASE_DIR)/host

GRAPHS_DIR := $(BASE_DIR)/graphs



LEGAL_INFO_DIR = $(BASE_DIR)/legal-info

REDIST_SOURCES_DIR_TARGET = $(LEGAL_INFO_DIR)/sources
@@ -658,14 +659,14 @@ show-targets: 
	@echo $(HOST_DEPS) $(TARGETS_HOST_DEPS) $(TARGETS) $(TARGETS_ROOTFS)



graph-build: $(O)/build/build-time.log

	@install -d $(O)/graphs

	@install -d $(GRAPHS_DIR)

	$(foreach o,name build duration,./support/scripts/graph-build-time \

					--type=histogram --order=$(o) --input=$(<) \

					--output=$(O)/graphs/build.hist-$(o).$(BR_GRAPH_OUT) \

					--output=$(GRAPHS_DIR)/build.hist-$(o).$(BR_GRAPH_OUT) \

					$(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))

	$(foreach t,packages steps,./support/scripts/graph-build-time \

				   --type=pie-$(t) --input=$(<) \

				   --output=$(O)/graphs/build.pie-$(t).$(BR_GRAPH_OUT) \

				   --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \

				   $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))



graph-depends-requirements:
@@ -673,11 +674,11 @@ graph-depends-requirements: 
		{ echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; }



graph-depends: graph-depends-requirements

	@$(INSTALL) -d $(O)/graphs

	@$(INSTALL) -d $(GRAPHS_DIR)

	@cd "$(CONFIG_DIR)"; \

	$(TOPDIR)/support/scripts/graph-depends $(BR2_GRAPH_DEPS_OPTS) \

	|tee $(BASE_DIR)/graphs/$(@).dot \

	|dot $(BR2_GRAPH_DOT_OPTS) -T$(BR_GRAPH_OUT) -o $(BASE_DIR)/graphs/$(@).$(BR_GRAPH_OUT)

	|tee $(GRAPHS_DIR)/$(@).dot \

	|dot $(BR2_GRAPH_DOT_OPTS) -T$(BR_GRAPH_OUT) -o $(GRAPHS_DIR)/$(@).$(BR_GRAPH_OUT)



else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
@@ -834,7 +835,7 @@ printvars: 
clean:

	rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \

		$(BUILD_DIR) $(BASE_DIR)/staging \

		$(LEGAL_INFO_DIR)

		$(LEGAL_INFO_DIR) $(GRAPHS_DIR)



distclean: clean

ifeq ($(DL_DIR),$(TOPDIR)/dl)

package/pkg-generic.mk

+3 −3
Original line number Diff line number Diff line
@@ -573,11 +573,11 @@ $(1)-show-depends: 
			@echo $$($(2)_FINAL_DEPENDENCIES)



$(1)-graph-depends: graph-depends-requirements

			@$$(INSTALL) -d $$(O)/graphs

			@$$(INSTALL) -d $$(GRAPHS_DIR)

			@cd "$$(CONFIG_DIR)"; \

			$$(TOPDIR)/support/scripts/graph-depends -p $(1) $$(BR2_GRAPH_DEPS_OPTS) \

			|tee $$(O)/graphs/$$(@).dot \

			|dot $$(BR2_GRAPH_DOT_OPTS) -T$$(BR_GRAPH_OUT) -o $$(O)/graphs/$$(@).$$(BR_GRAPH_OUT)

			|tee $$(GRAPHS_DIR)/$$(@).dot \

			|dot $$(BR2_GRAPH_DOT_OPTS) -T$$(BR_GRAPH_OUT) -o $$(GRAPHS_DIR)/$$(@).$$(BR_GRAPH_OUT)



$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)