diff -aruN a/Makefile b/Makefile
--- a/Makefile	2010-10-03 12:56:13.000000000 -0700
+++ b/Makefile	2010-11-02 17:21:36.093700129 -0700
@@ -7,11 +7,8 @@
 # COPYING for details.
 #
 
-# You don't need to edit these; change the contents of the conf-cc and conf-ld
-# files if you need to change the compile/link commands.  See the README for
-# more information.
-CC			= $(shell head -n 1 conf-cc)
-LD			= $(shell head -n 1 conf-ld)
+compile		= $(CC) -O2 -DPOSIX -D_POSIX_C_SOURCE=200809L -D_FILE_OFFSET_BITS=64 -DTEST_NARROW_WRITES -c
+link		= $(CC) -o
 
 SOURCES		= memtester.c tests.c
 OBJECTS		= $(SOURCES:.c=.o)
@@ -74,11 +71,11 @@
 	rm -f memtester $(TARGETS) $(OBJECTS) core
 
 memtester: \
-$(OBJECTS) memtester.c tests.h tests.c tests.h conf-cc Makefile load extra-libs
-	./load memtester tests.o `cat extra-libs`
+$(OBJECTS) memtester.c tests.h tests.c tests.h Makefile
+	$(link) memtester memtester.o tests.o
 
-memtester.o: memtester.c tests.h conf-cc Makefile compile
-	./compile memtester.c
+memtester.o: memtester.c tests.h Makefile
+	$(compile) memtester.c
 
-tests.o: tests.c tests.h conf-cc Makefile compile
-	./compile tests.c
+tests.o: tests.c tests.h Makefile
+	$(compile) tests.c