From e36ceaf5bd39f74c8f495fba6f99496433b2ec7d Mon Sep 17 00:00:00 2001 From: Cory Date: Sun, 3 Dec 2023 16:44:34 +0100 Subject: [PATCH] Add command for Latex --- Makefile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9cb9989..ac7c14b 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,13 @@ CC=mpic++ # Flags -CFLAGS=-Wall -larmadillo -std=c++11 -O3 -fomit-frame-pointer -fopenmp - +CFLAGS=-Wall -larmadillo -std=c++11 -O3 -fopenmp PROFFLAGS=-pg -fno-inline-functions DBGFLAGS=-DDBG -g MKDIR=mkdir -p RMDIR=rm -rf -INSTRUMENTATION=scorep +INSTRUMENT=scorep # Directories for binaries BINDIR=./bin @@ -22,6 +21,9 @@ BINOBJDIR=$(BUILDDIR)/objs PROFOBJDIR=$(BUILDDIR)/prof DEBUGOBJDIR=$(BUILDDIR)/debug +# Directory for latex source +LATEXDIR=./latex + # Source directories SRC=./src INCLUDE=./include @@ -40,7 +42,7 @@ PROFBINS=$(PROFDIR)/phase_transition_mpi DEBUGBINS=$(addprefix $(DEBUGDIR)/, $(EXEC)) # List phony targets -.PHONY: all clean binclean objclean latex +.PHONY: all profile debug latex clean binclean objclean latexclean # "Commands" all: $(BINS) @@ -49,6 +51,10 @@ profile: $(PROFBINS) debug: $(DEBUGBINS) +# build latex file +latex: + $(MAKE) -C $(LATEXDIR) + # Rule for binaries $(BINDIR)/%: $(BINOBJDIR)/%.o $(BINOBJS) $(MKDIR) $(BINDIR) @@ -57,7 +63,7 @@ $(BINDIR)/%: $(BINOBJDIR)/%.o $(BINOBJS) # Rule for profiling binaries $(PROFDIR)/%: $(PROFOBJDIR)/%.o $(PROFOBJS) $(MKDIR) $(PROFDIR) - $(INSTRUMENTATION) $(CC) $^ -o $@ $(CFLAGS) $(PROFFLAGS) -I$(INCLUDE) + $(INSTRUMENT) $(CC) $^ -o $@ $(CFLAGS) $(PROFFLAGS) -I$(INCLUDE) # Rule for debug binaries $(DEBUGDIR)/%: $(DEBUGOBJDIR)/%.o $(DEBUGOBJS) @@ -72,18 +78,18 @@ $(BINOBJDIR)/%.o: $(SRC)/%.cpp # Rule for instrumented object files $(PROFOBJDIR)/%.o: $(SRC)/%.cpp $(MKDIR) $(PROFOBJDIR) - $INSTRUMENTATION $(CC) -c $^ -o $@ $(CFLAGS) $(PROFFLAGS) -I$(INCLUDE) + $(INSTRUMENT) $(CC) -c $^ -o $@ $(CFLAGS) $(PROFFLAGS) -I$(INCLUDE) # Rule for debug object files $(DEBUGOBJDIR)/%.o: $(SRC)/%.cpp $(MKDIR) $(DEBUGOBJDIR) $(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAG) $(DEBUGFLAGS) -I$(INCLUDE) -latex: - pdflatex --output-directory=./latexout ./latex/ising_model - # Cleaning -clean: objclean binclean +clean: objclean binclean latexclean + +latexclean: + $(MAKE) -C $(LATEXDIR) clean objclean: $(RMDIR) $(BUILDDIR)