--- Makefile.orig	2003-03-31 14:39:29.000000000 +0200
+++ Makefile	2011-03-26 12:58:40.517004812 +0100
@@ -2,13 +2,12 @@
 GHCI = ghci
 
 SRCS = main.hs Input.hs VM.hs Tokens.hs
-OBJS = main.o Input.o VM.o Tokens.o
-OPTS = -O -fvia-C
+OPTS = -O
 
 TARGET = wspace
 
-$TARGET: ${OBJS}
-	${GHC} ${OPTS} ${OBJS} -o ${TARGET}
+$TARGET: ${SRCS}
+	${GHC} --make ${OPTS} ${SRCS} -o ${TARGET}
 
 ghci: 
 	${GHCI} ${OPTS} main.hs
@@ -19,21 +18,3 @@
 clean:
 	rm -f ${TARGET} ${OBJS}
 	rm -f *~ *.hi
-
-%.o: %.hs
-	${GHC} -c ${OPTS} $< -o $@
-
-%.hi: %.o
-	@:
-
-# DO NOT DELETE: Beginning of Haskell dependencies
-main.o : main.hs
-main.o : ./Tokens.hi
-main.o : ./VM.hi
-main.o : ./Input.hi
-Input.o : Input.hs
-Input.o : ./Tokens.hi
-Input.o : ./VM.hi
-VM.o : VM.hs
-Tokens.o : Tokens.hs
-# DO NOT DELETE: End of Haskell dependencies