Browse Source

Makefile: standardize command output

Nathalie Furmento 5 years ago
parent
commit
9e7a45abc2
6 changed files with 41 additions and 31 deletions
  1. 2 2
      examples/Makefile.am
  2. 2 2
      mpi/examples/Makefile.am
  3. 1 1
      mpi/tools/Makefile.am
  4. 10 0
      starpu.mk
  5. 1 1
      tests/Makefile.am
  6. 25 25
      tools/Makefile.am

+ 2 - 2
examples/Makefile.am

@@ -1118,10 +1118,10 @@ endif
 # - link over source file to build our own object
 fortran90/starpu_mod.f90:
 	@$(MKDIR_P) $(dir $@)
-	$(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
+	$(V_ln) $(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
 native_fortran/fstarpu_mod.f90:
 	@$(MKDIR_P) $(dir $@)
-	$(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
+	$(V_ln) $(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
 
 if STARPU_HAVE_FC
 # Fortran90 example

+ 2 - 2
mpi/examples/Makefile.am

@@ -395,10 +395,10 @@ endif
 # - link over source file to build our own object
 native_fortran/fstarpu_mod.f90:
 	@$(MKDIR_P) $(dir $@)
-	$(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
+	$(V_ln) $(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
 native_fortran/fstarpu_mpi_mod.f90:
 	@$(MKDIR_P) $(dir $@)
-	$(LN_S) $(abs_top_srcdir)/mpi/include/$(notdir $@) $@
+	$(V_ln) $(LN_S) $(abs_top_srcdir)/mpi/include/$(notdir $@) $@
 
 if STARPU_HAVE_MPIFORT
 if BUILD_EXAMPLES

+ 1 - 1
mpi/tools/Makefile.am

@@ -29,7 +29,7 @@ CC=$(CC_OR_MPICC)
 CCLD=$(CC_OR_MPICC)
 
 starpu_replay.c starpu_replay_sched.c:
-	$(LN_S) $(top_srcdir)/tools/$(notdir $@) $@
+	$(V_ln) $(LN_S) $(top_srcdir)/tools/$(notdir $@) $@
 
 if STARPU_SIMGRID
 bin_PROGRAMS = starpu_replay_mpi

+ 10 - 0
starpu.mk

@@ -29,6 +29,16 @@ V_icc_0 = @echo "  ICC     " $@;
 V_icc_1 =
 V_icc   = $(V_icc_$(V))
 
+V_ln_  = $(V_ln_$(AM_DEFAULT_VERBOSITY))
+V_ln_0 = @echo "  LN      " $@;
+V_ln_1 =
+V_ln   = $(V_ln_$(V))
+
+V_help2man_  = $(V_help2man_$(AM_DEFAULT_VERBOSITY))
+V_help2man_0 = @echo "  HELP2MAN" $@;
+V_help2man_1 =
+V_help2man   = $(V_help2man_$(V))
+
 showfailed:
 	@! grep "^FAIL " $(TEST_LOGS) /dev/null
 	@! grep -l "ERROR: AddressSanitizer: " $(TEST_LOGS) /dev/null

+ 1 - 1
tests/Makefile.am

@@ -1008,7 +1008,7 @@ sched_policies_execute_all_tasks_LDFLAGS = $(AM_LDFLAGS) -lm
 # - link over source file to build our own object
 fortran90/starpu_mod.f90:
 	@$(MKDIR_P) $(dir $@)
-	$(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
+	$(V_ln) $(LN_S) $(abs_top_srcdir)/include/$(notdir $@) $@
 
 if STARPU_HAVE_FC
 # - express the creation of .mod along .o

+ 25 - 25
tools/Makefile.am

@@ -456,49 +456,49 @@ endif
 
 if STARPU_HAVE_HELP2MAN
 starpu_calibrate_bus.1: starpu_calibrate_bus$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Force StarPU bus calibration" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Force StarPU bus calibration" --output=$@ ./$<
 starpu_machine_display.1: starpu_machine_display$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Display machine StarPU information" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Display machine StarPU information" --output=$@ ./$<
 starpu_perfmodel_display.1: starpu_perfmodel_display$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Display StarPU performance model" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Display StarPU performance model" --output=$@ ./$<
 starpu_perfmodel_plot.1: starpu_perfmodel_plot$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Plot StarPU performance model" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Plot StarPU performance model" --output=$@ ./$<
 starpu_tasks_rec_complete.1: starpu_tasks_rec_complete$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Complete StarPU tasks.rec file" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Complete StarPU tasks.rec file" --output=$@ ./$<
 starpu_lp2paje.1: starpu_lp2paje$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Convert lp StarPU schedule into Paje format" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Convert lp StarPU schedule into Paje format" --output=$@ ./$<
 starpu_workers_activity.1: starpu_workers_activity
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Display StarPU workers activity" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Display StarPU workers activity" --output=$@ ./$<
 starpu_codelet_profile.1: starpu_codelet_profile
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Draw StarPU codelet profile" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Draw StarPU codelet profile" --output=$@ ./$<
 starpu_env.1: starpu_env
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Set StarPU environment variables" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Set StarPU environment variables" --output=$@ ./$<
 starpu_codelet_histo_profile.1: starpu_codelet_histo_profile
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Draw StarPU codelet histogram" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Draw StarPU codelet histogram" --output=$@ ./$<
 starpu_mpi_comm_matrix.1: starpu_mpi_comm_matrix.py
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Draw StarPU MPI communications matrix" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Draw StarPU MPI communications matrix" --output=$@ ./$<
 starpu_fxt_number_events_to_names.1: starpu_fxt_number_events_to_names.py
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Count events in StarPU traces" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Count events in StarPU traces" --output=$@ ./$<
 starpu_paje_draw_histogram.1: starpu_paje_draw_histogram
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Draw StarPU trace histogram" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Draw StarPU trace histogram" --output=$@ ./$<
 starpu_paje_state_stats.1: starpu_paje_state_stats
-	chmod +x $<
-	help2man --no-discard-stderr -N -n "Print statistics from StarPU trace" --output=$@ ./$<
+	@chmod +x $<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Print statistics from StarPU trace" --output=$@ ./$<
 
 if STARPU_USE_FXT
 starpu_fxt_tool.1: starpu_fxt_tool$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Convert raw StarPU FxT trace to various traces" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Convert raw StarPU FxT trace to various traces" --output=$@ ./$<
 starpu_fxt_stats.1: starpu_fxt_stats$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Print statistics from raw StarPU FxT trace" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Print statistics from raw StarPU FxT trace" --output=$@ ./$<
 starpu_fxt_data_trace.1: starpu_fxt_data_trace$(EXEEXT)
-	help2man --no-discard-stderr -N -n "Print data trace from raw StarPU FxT trace" --output=$@ ./$<
+	$(V_help2man) help2man --no-discard-stderr -N -n "Print data trace from raw StarPU FxT trace" --output=$@ ./$<
 endif
 
 dist_man1_MANS =\