From 4f6f16636baaa151dd79233d4ef19b4a2b6d0c83 Mon Sep 17 00:00:00 2001 From: Cory Date: Mon, 4 Dec 2023 12:39:01 +0100 Subject: [PATCH] Fix some small bugs and add executables --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ac7c14b..79ee877 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ # The compiler -CC=mpic++ +CC=mpicxx # Flags CFLAGS=-Wall -larmadillo -std=c++11 -O3 -fopenmp -PROFFLAGS=-pg -fno-inline-functions +PROFFLAGS=-fno-inline-functions DBGFLAGS=-DDBG -g MKDIR=mkdir -p @@ -36,7 +36,7 @@ PROFOBJS=$(addprefix $(PROFOBJDIR)/, $(SRCFILES:.cpp=.o)) DEBUGOBJS=$(addprefix $(DEBUGOBJDIR)/, $(SRCFILES:.cpp=.o)) # Location for Binaries -EXEC=main phase_transition_mpi test_suite time +EXEC=main test_suite phase_transition phase_transition_mpi time pd_estimate mcmc_progression BINS=$(addprefix $(BINDIR)/, $(EXEC)) PROFBINS=$(PROFDIR)/phase_transition_mpi DEBUGBINS=$(addprefix $(DEBUGDIR)/, $(EXEC)) @@ -68,7 +68,7 @@ $(PROFDIR)/%: $(PROFOBJDIR)/%.o $(PROFOBJS) # Rule for debug binaries $(DEBUGDIR)/%: $(DEBUGOBJDIR)/%.o $(DEBUGOBJS) $(MKDIR) $(DEBUGDIR) - $(CC) $^ -o $@ $(CFLAGS) $(DEBUGFLAGS) -I$(INCLUDE) + $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAGS) -I$(INCLUDE) # Rule for object files $(BINOBJDIR)/%.o: $(SRC)/%.cpp @@ -83,7 +83,7 @@ $(PROFOBJDIR)/%.o: $(SRC)/%.cpp # Rule for debug object files $(DEBUGOBJDIR)/%.o: $(SRC)/%.cpp $(MKDIR) $(DEBUGOBJDIR) - $(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAG) $(DEBUGFLAGS) -I$(INCLUDE) + $(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAGS) -I$(INCLUDE) # Cleaning clean: objclean binclean latexclean