Bug fix

Makefile

@@ -14,11 +14,13 @@ OPT += -DWRITE_IMAGE
 
 CC = gcc
 CXX = g++
-MPICC = mpicc
-MPICXX = mpiCC 
+ifeq (USE_MPI,$(findstring USE_MPI,$(OPT)))
+  CC = mpicc
+  CXX = mpiCC 
+endif
 
-#OMP = -fopenmp 
-OMP = 
+OMP = -fopenmp 
+#OMP = 
 
 CFLAGS += -O3 -mcpu=native
 CFLAGS += -I.
@@ -49,12 +51,12 @@ serial_cuda:
 	$(CXX) $(CFLAGS) $(OPT) -o w-stackingfftw_serial w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) -lm
 
 mpi: $(COBJ) 
-	$(MPICC) $(OMP) -o w-stackingCfftw $(CFLAGS) $^ $(LIBS)
+	$(CC) $(OMP) -o w-stackingCfftw $(CFLAGS) $^ $(LIBS)
 
 mpi_cuda:
 	$(NVCC) $(NVFLAGS) -c w-stacking.cu phase_correction.cu $(NVLIB)
-	$(MPICC) $(CFLAGS) $(OPT) -c w-stacking-fftw.c
-	$(MPICXX) $(CFLAGS) $(OPT) -o w-stackingfftw w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) $(LIBS) -lm
+	$(CC) $(CFLAGS) $(OPT) -c w-stacking-fftw.c
+	$(CXX) $(CFLAGS) $(OPT) -o w-stackingfftw w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) $(LIBS) -lm
 
 clean:
 	rm *.o