new tabulator, remove evolver

1 files changed, 6 insertions, 20 deletions

diff --git a/makefile b/makefile
index 5cfcef9..b634f2d 100644
--- a/makefile
+++ b/makefile
@@ -1,26 +1,20 @@
-CPP_ARGS = -std=c++20 -O2 -Wall -Wextra -Iinclude -ggdb
+# https://github.com/open-mpi/ompi/issues/5157
+CPP_ARGS = -std=c++20 -O2 -Wall -Wextra -Iinclude -ggdb $(shell mpic++ --showme:compile) -DOMPI_SKIP_MPICXX
+MPI_LD_ARGS = $(shell mpic++ --showme:link)
 
 GTKMM_CPP_ARGS = $(shell pkg-config --cflags gtkmm-4.0)
 GTKMM_LD_ARGS = $(shell pkg-config --libs gtkmm-4.0)
 
-# https://github.com/open-mpi/ompi/issues/5157
-MPI_CPP_ARGS = $(shell mpic++ --showme:compile) -DOMPI_SKIP_MPICXX
-MPI_LD_ARGS = $(shell mpic++ --showme:link)
-
-default: bin/bench bin/evolver bin/tabulator-mpi
+default: bin/bench bin/tabulator
 
 clean:
 	rm -r obj bin
 
 bin/bench: obj/bench/main.o obj/bench/bench_window.o obj/bench/core_widget.o obj/lib94.o
 	@mkdir -p $(dir $@)
-	g++ ${CPP_ARGS} $^ ${GTKMM_LD_ARGS} -o $@
-
-bin/evolver: obj/evolver/evolver.o obj/lib94.o
-	@mkdir -p $(dir $@)
-	g++ ${CPP_ARGS} $^ ${MPI_LD_ARGS} -o $@
+	g++ ${CPP_ARGS} $^ ${MPI_LD_ARGS} ${GTKMM_LD_ARGS} -o $@
 
-bin/tabulator-mpi: obj/tabulator-mpi/source.o obj/lib94.o
+bin/tabulator: obj/tabulator/tabulator.o obj/lib94.o
 	@mkdir -p $(dir $@)
 	g++ ${CPP_ARGS} $^ ${MPI_LD_ARGS} -o $@
 
@@ -31,14 +25,6 @@ obj/bench/%.o: bench/%.cpp
 	@mkdir -p $(dir $@)
 	g++ -c ${CPP_ARGS} ${GTKMM_CPP_ARGS} $^ -o $@
 
-obj/evolver/%.o: evolver/%.cpp
-	@mkdir -p $(dir $@)
-	g++ -c ${CPP_ARGS} ${MPI_CPP_ARGS} $^ -o $@
-
-obj/tabulator-mpi/%.o: tabulator-mpi/%.cpp
-	@mkdir -p $(dir $@)
-	g++ -c ${CPP_ARGS} ${MPI_CPP_ARGS} $^ -o $@
-
 obj/%.o: %.cpp
 	@mkdir -p $(dir $@)
 	g++ -c ${CPP_ARGS} $^ -o $@