From eac411d71b9f115e24dcd85e99b6d005efd4fc81 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Fri, 11 Dec 2015 15:12:41 +0000 Subject: [PATCH] Only one version of the swift executable. --- examples/Makefile.am | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index f43bfe895b..a65ae0376b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -29,11 +29,11 @@ MPI_LIBS = $(METIS_LIBS) $(MPI_THREAD_LIBS) MPI_FLAGS = -DWITH_MPI $(METIS_INCS) # Set-up the library -bin_PROGRAMS = swift swift_fixdt swift_mindt +bin_PROGRAMS = swift # Build MPI versions as well? if HAVEMPI -bin_PROGRAMS += swift_mpi swift_fixdt_mpi swift_mindt_mpi +bin_PROGRAMS += swift_mpi endif # engine_policy_setaffinity is available? @@ -48,28 +48,8 @@ swift_SOURCES = main.c swift_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) -DENGINE_POLICY="engine_policy_multistep | engine_policy_keep | engine_policy_setaffinity" swift_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) -# Sources for swift_fixdt -swift_fixdt_SOURCES = main.c -swift_fixdt_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) -DENGINE_POLICY="engine_policy_fixdt | engine_policy_keep | engine_policy_setaffinity" -swift_fixdt_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) - -# Sources for swift_mindt -swift_mindt_SOURCES = main.c -swift_mindt_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) -DENGINE_POLICY="engine_policy_keep | engine_policy_setaffinity" -swift_mindt_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) - # Sources for swift_mpi swift_mpi_SOURCES = main.c swift_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_multistep | engine_policy_keep" swift_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS) -# Sources for swift_fixdt_mpi -swift_fixdt_mpi_SOURCES = main.c -swift_fixdt_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_fixdt | engine_policy_keep" -swift_fixdt_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS) - -# Sources for swift_mindt_mpi -swift_mindt_mpi_SOURCES = main.c -swift_mindt_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_keep" -swift_mindt_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS) - -- GitLab