Explorar el Código

tools/Makefile.am: revert #5596.

.1 files depend again on executable files. Having them depending on .c files breaks when using make -j.

make distcheck is fixed by adding a clean-local rule to delete the .1 files.

.1 files are only part of the distrib when helpman is available i.e when they can be generated.
Nathalie Furmento hace 13 años
padre
commit
35f4774efc
Se han modificado 1 ficheros con 8 adiciones y 9 borrados
  1. 8 9
      tools/Makefile.am

+ 8 - 9
tools/Makefile.am

@@ -51,23 +51,22 @@ dist_bin_SCRIPTS +=	\
 
 
 if STARPU_HAVE_HELP2MAN
-starpu_calibrate_bus.1: starpu_calibrate_bus.c $(top_srcdir)/configure.ac
-	$(MAKE) starpu_calibrate_bus$(EXEEXT)
+starpu_calibrate_bus.1: starpu_calibrate_bus$(EXEEXT)
 	help2man --no-discard-stderr -N --output=$@ ./starpu_calibrate_bus$(EXEEXT)
-starpu_machine_display.1: starpu_machine_display.c $(top_srcdir)/configure.ac
-	$(MAKE) starpu_machine_display$(EXEEXT)
+starpu_machine_display.1: starpu_machine_display$(EXEEXT)
 	help2man --no-discard-stderr -N --output=$@ ./starpu_machine_display$(EXEEXT)
-starpu_perfmodel_display.1: starpu_perfmodel_display.c $(top_srcdir)/configure.ac
-	$(MAKE) starpu_perfmodel_display$(EXEEXT)
+starpu_perfmodel_display.1: starpu_perfmodel_display$(EXEEXT)
 	help2man --no-discard-stderr -N --output=$@ ./starpu_perfmodel_display$(EXEEXT)
-starpu_perfmodel_plot.1: starpu_perfmodel_plot.c $(top_srcdir)/configure.ac
-	$(MAKE) starpu_perfmodel_plot$(EXEEXT)
+starpu_perfmodel_plot.1: starpu_perfmodel_plot$(EXEEXT)
 	help2man --no-discard-stderr -N --output=$@ ./starpu_perfmodel_plot$(EXEEXT)
-endif
+
+clean-local:
+	$(RM) starpu_calibrate_bus.1 starpu_machine_display.1 starpu_perfmodel_display.1 starpu_perfmodel_plot.1
 
 dist_man1_MANS =\
 	starpu_calibrate_bus.1 \
 	starpu_machine_display.1 \
 	starpu_perfmodel_display.1 \
 	starpu_perfmodel_plot.1
+endif