--- Makefile.orig	1998-04-03 01:28:43.000000000 +1000
+++ Makefile	2014-07-19 14:15:20.000000000 +1000
@@ -9,55 +9,55 @@
        funct.o cdomso.o craptest.o runtest.o
 
 diehard: $(OBJS)
-	$(CC) -lm -o diehard $(OBJS)
+	$(CC) $(LDFLAGS) -lm -o diehard $(OBJS)
 
 diehard.o: diehard.c header.h macro.h
-	$(CC) -c diehard.c
+	$(CC) $(CFLAGS) -c diehard.c
 
 d3sphere.o: d3sphere.c header.h macro.h
-	$(CC) -c d3sphere.c
+	$(CC) $(CFLAGS) -c d3sphere.c
 
 kstest.o: kstest.c header.h macro.h	 
-	$(CC) -c kstest.c
+	$(CC) $(CFLAGS) -c kstest.c
 
 cdoperm5.o: cdoperm5.c header.h
-	$(CC) -c cdoperm5.c
+	$(CC) $(CFLAGS) -c cdoperm5.c
 
 squeez.o: squeez.c header.h macro.h
-	$(CC) -c squeez.c
+	$(CC) $(CFLAGS) -c squeez.c
 
 cdbday.o: cdbday.c header.h
-	$(CC) -c cdbday.c
+	$(CC) $(CFLAGS) -c cdbday.c
 
 cdosum.o: cdosum.c header.h
-	$(CC) -c cdosum.c
+	$(CC) $(CFLAGS) -c cdosum.c
 
 df.o: df.c 
-	$(CC) -c df.c
+	$(CC) $(CFLAGS) -c df.c
 
 funct.o: funct.c macro.h
-	$(CC) -c funct.c
+	$(CC) $(CFLAGS) -c funct.c
 
 mindist.o: mindist.c header.h macro.h
-	$(CC) -c mindist.c
+	$(CC) $(CFLAGS) -c mindist.c
 
 cdbinrnk.o: cdbinrnk.c header.h macro.h
-	$(CC) -c cdbinrnk.c
+	$(CC) $(CFLAGS) -c cdbinrnk.c
 
 cdpark.o: cdpark.c header.h macro.h
-	$(CC) -c cdpark.c
+	$(CC) $(CFLAGS) -c cdpark.c
 
 cdbitst.o: cdbitst.c header.h
-	$(CC) -c cdbitst.c
+	$(CC) $(CFLAGS) -c cdbitst.c
 
 cnt1s.o: cnt1s.c header.h
-	$(CC) -c cnt1s.c
+	$(CC) $(CFLAGS) -c cnt1s.c
 
 cdomso.o: cdomso.c header.h
-	$(CC) -c cdomso.c
+	$(CC) $(CFLAGS) -c cdomso.c
 
 craptest.o: craptest.c header.h macro.h
-	$(CC) -c craptest.c
+	$(CC) $(CFLAGS) -c craptest.c
 	
 runtest.o: runtest.c header.h macro.h
-	$(CC) -c runtest.c
+	$(CC) $(CFLAGS) -c runtest.c