Get scripts back into dist tarballs

Makefile.am

@@ -19,7 +19,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Show the way...
-SUBDIRS = src examples doc tests
+SUBDIRS = src examples doc tests tools
 
 # Non-standard files that should be part of the distribution.
 EXTRA_DIST = INSTALL.swift .clang-format format.sh

configure.ac

@@ -1579,6 +1579,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$ac_cv_path_ac_pt_DX_DOXYGEN" != ""])
 
 # Handle .in files.
 AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile doc/Makefile doc/Doxyfile tests/Makefile])
+AC_CONFIG_FILES([tools/Makefile])
 AC_CONFIG_FILES([tests/testReading.sh], [chmod +x tests/testReading.sh])
 AC_CONFIG_FILES([tests/testActivePair.sh], [chmod +x tests/testActivePair.sh])
 AC_CONFIG_FILES([tests/test27cells.sh], [chmod +x tests/test27cells.sh])

examples/Makefile.am

-# tHIS FIle is part of SWIFT.
+# This file is part of SWIFT.
 # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
 #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
 #
@@ -105,18 +105,3 @@ EXTRA_DIST = CoolingBox/coolingBox.yml CoolingBox/energy_plot.py CoolingBox/make
 
 # Default parameter file
 EXTRA_DIST += parameter_example.yml
-
-# Scripts to plot task graphs
-EXTRA_DIST += plot_tasks.py analyse_tasks.py process_plot_tasks_MPI process_plot_tasks
-
-# Scripts to plot threadpool 'task' graphs
-EXTRA_DIST += analyse_threadpool_tasks.py \
-              plot_threadpool.py \
-              process_plot_threadpool
-
-# Script for scaling plot
-EXTRA_DIST += plot_scaling_results.py \
-              plot_scaling_results_breakdown.py
-
-# Script for gravity accuracy
-EXTRA_DIST += plot_gravity_checks.py

tools/Makefile.am

+# Scripts to plot task graphs
+EXTRA_DIST = task_plots/plot_tasks.py task_plots/analyse_tasks.py \
+	     task_plots/process_plot_tasks_MPI task_plots/process_plot_tasks
+
+# Scripts to plot threadpool 'task' graphs
+EXTRA_DIST += task_plots/analyse_threadpool_tasks.py \
+              task_plots/plot_threadpool.py \
+              task_plots/process_plot_threadpool
+
+# Script for scaling plot
+EXTRA_DIST += plot_scaling_results.py \
+              plot_scaling_results_breakdown.py
+
+# Script for gravity accuracy
+EXTRA_DIST += plot_gravity_checks.py
+
+# Combine ICs.
+EXTRA_DIST += combine_ics.py