Improved Makefile.

Prevents glibc linking issues caused when any of the library directories are left blank on CentOS.

Makefile

@@ -18,17 +18,33 @@
 -include Makefile.local
 
 GMP ?= /usr/local
+NTL ?=
 CUDA ?= /usr/local/cuda
 LIBEVENT ?= /usr/local
 MPI ?= /usr/local
 CXX ?= g++
 
+GMP_LIB = $(if $(strip $(GMP)), -L$(GMP)/lib)
+GMP_INC = $(if $(strip $(GMP)), -I$(GMP)/include)
+
+NTL_LIB = $(if $(strip $(NTL)), -L$(NTL)/lib)
+NTL_INC = $(if $(strip $(NTL)), -I$(NTL)/include)
+
+CUDA_LIB = $(if $(strip $(CUDA)), -L$(CUDA)/lib64)
+CUDA_INC = $(if $(strip $(CUDA)), -I$(CUDA)/include)
+
+LIBEVENT_LIB = $(if $(strip $(LIBEVENT)), -L$(LIBEVENT)/lib)
+LIBEVENT_INC = $(if $(strip $(LIBEVENT)), -I$(LIBEVENT)/include)
+
+MPI_LIB = $(if $(strip $(MPI)), -L$(MPI)/lib)
+MPI_INC = $(if $(strip $(MPI)), -I$(MPI)/include)
+
 WORDS = 24
 MACROS=-UVERBOSE
 # options: VERBOSE DERANDOMIZE SAVE_DPS MAKE_VERSIONS_COMPARABLE
 
 CXXFLAGS=-g -Wall -O2
-CPPFLAGS=-DWORDS=$(WORDS) -I$(LIBEVENT)/include -I$(GMP)/include -std=c++11 $(MACROS)
+CPPFLAGS=-DWORDS=$(WORDS) $(LIBEVENT_INC) $(GMP_INC) $(NTL_INC) -std=c++11 $(MACROS)
 NVCCOPTS=-g -arch sm_30 --ptxas-options=-v -O2
 NVCC=nvcc $(NVCCOPTS)
 
@@ -46,13 +62,13 @@ nompi: $(NOMPI_TARGETS)
 ptx: $(PTX_TARGETS)
 
 gen_N: gen_N.o
-	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp -lpthread
+	g++ -g -Wall $^ -o $@ $(NTL_LIB) -lntl $(GMP_LIB) -lgmp -lpthread
 
 dlrho: dlrho.o cudadl.o desired_resources.o
-	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart -lpthread
+	g++ -g -Wall $^ -o $@ $(NTL_LIB) -lntl $(GMP_LIB) -lgmp $(CUDA_LIB) -lcudart -lpthread
 
 dlrho.o: dlrho.cc
-	g++ $(CXXFLAGS) $(CPPFLAGS) -I$(CUDA)/include $^ -c -o $@
+	g++ $(CXXFLAGS) $(CPPFLAGS) $(CUDA_INC) $^ -c -o $@
 
 parrhoasm.ptx: parrhoasm.cu cios.asm dpstream.cu
 	$(NVCC) $(CPPFLAGS) -c $< -o $@ --ptx
@@ -61,28 +77,28 @@ cudadl.o: parrhoasm.cu cios.asm dpstream.cu
 	$(NVCC) $(CPPFLAGS) -c $< -o $@
 
 test_cuda: parrhoasm.cu cios.asm dpstream.cu
-	$(NVCC) -DTEST_CUDA $(CPPFLAGS) $< -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart -lpthread
+	$(NVCC) -DTEST_CUDA $(CPPFLAGS) $< -o $@ $(NTL_LIB) -lntl $(GMP_LIB) -lgmp $(CUDA_LIB) -lcudart -lpthread
 
 cios.asm: gencios_reg_20
 	./gencios_reg_20 $(WORDS) > $@
 
 controller: controller.o evutils.o controller_main.o desired_resources.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp -lpthread
+	g++ -g -Wall $^ -o $@ $(NTL_LIB) -lntl $(LIBEVENT_LIB) -Wl,-rpath=$(LIBEVENT)/lib -levent $(GMP_LIB) -lgmp -lpthread
 
 dpnode: dpnode.o evutils.o dpnode_main.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp -lpthread
+	g++ -g -Wall $^ -o $@ $(NTL_LIB) -lntl $(LIBEVENT_LIB) -Wl,-rpath=$(LIBEVENT)/lib -levent $(GMP_LIB) -lgmp -lpthread
 
 worker: worker.o evutils.o cudadl.o worker_main.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -levent_pthreads -lntl -L$(GMP) -lgmp -lpthread -L$(CUDA)/lib64 -lcudart
+	g++ -g -Wall $^ -o $@ $(NTL_LIB) -lntl $(LIBEVENT_LIB) -Wl,-rpath=$(LIBEVENT)/lib -levent -levent_pthreads $(GMP_LIB) -lgmp -lpthread $(CUDA_LIB) -lcudart
 
 worker.o: worker.cc
 	g++ $(CXXFLAGS) $(CPPFLAGS) -I$(CUDA)/include $^ -c -o $@
 
 desres: desired_resources.cc
-	g++ $(CXXFLAGS) $(CPPFLAGS) -DTEST_DESIRED_RESOURCES $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -lntl -lgmp -lpthread
+	g++ $(CXXFLAGS) $(CPPFLAGS) -DTEST_DESIRED_RESOURCES $^ -o $@ $(NTL_LIB) -lntl $(LIBEVENT_LIB) -Wl,-rpath=$(LIBEVENT)/lib -lgmp -lpthread
 
 mpi: mpi.o
-	mpiCC -g -Wall $^ -o $@ -L/work/iang/sw/lib -lntl -L$(GMP) -lgmp -lpthread
+	mpiCC -g -Wall $^ -o $@ -L/work/iang/sw/lib $(NTL_LIB) -lntl $(GMP_LIB) -lgmp -lpthread
 
 mpi.o: mpi.cc
 	mpiCC $(CXXFLAGS) $(CPPFLAGS) $^ -c -o $@