Make the Makefile robust enough to compile on monk

Makefile

@@ -19,8 +19,9 @@ LIBEVENT=/usr/local
 
 WORDS = 24
 
-CXXFLAGS=-g -Wall -O0 -DWORDS=$(WORDS) -I$(LIBEVENT)/include
-NVCCOPTS=-g -arch sm_20 --ptxas-options=-v -O2 -DWORDS=$(WORDS)
+CXXFLAGS=-g -Wall -O0
+CPPFLAGS=-DWORDS=$(WORDS) -I$(LIBEVENT)/include -I$(GMP)/include
+NVCCOPTS=-g -arch sm_20 --ptxas-options=-v -O2
 NVCC=nvcc $(NVCCOPTS)
 
 CXXFILES = dlrho.cc gen_N.cc
@@ -31,28 +32,28 @@ TARGETS = gen_N dlrho controller dpnode worker
 all: $(TARGETS)
 
 gen_N: gen_N.o
-	g++ -g -Wall $^ -o $@ -lntl -lgmp
+	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp
 
 dlrho: dlrho.o cudadl.o
-	g++ -g -Wall $^ -o $@ -lntl -lgmp -L/usr/local/cuda/lib64 -lcudart
+	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart
 
 dlrho.o: dlrho.cc
-	g++ $(CXXFLAGS) -I /usr/local/cuda/include $^ -c -o $@
+	g++ $(CXXFLAGS) $(CPPFLAGS) -I$(CUDA)/include $^ -c -o $@
 
 cudadl.o: parrhoasm.cu cios.asm dpstream.cu
-	$(NVCC) -c parrhoasm.cu -o cudadl.o
+	$(NVCC) $(CPPFLAGS) -c parrhoasm.cu -DWORDS=$(WORDS) -o cudadl.o
 
 cios.asm: gencios_reg_20
 	./gencios_reg_20 $(WORDS) > $@
 
 controller: controller.o evutils.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -levent -lntl -lgmp
+	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp
 
 dpnode: dpnode.o evutils.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -levent -lntl -lgmp
+	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp
 
 worker: worker.o evutils.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -levent -lntl -lgmp -lpthread
+	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp -lpthread
 
 clean:
 	-rm -f $(OFILES)