Fix merge

tools/Makefile.am

@@ -20,10 +20,6 @@ include $(top_srcdir)/starpu.mk
 
 SUBDIRS =
 
-if STARPU_SIMGRID
-SUBDIRS += replay
-endif
-
 AM_CFLAGS = $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(STARPU_COI_CPPFLAGS) $(GLOBAL_AM_CFLAGS) $(STARPU_FPGA_CPPFLAGS)
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@ $(FXT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src