diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index fd4e825..5a122ae
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,34 @@
-TARGET = spinsim
+# CC, EXT, and BUILD may be overridden by a top level makefile (e.g. for
+# cross compiling)
+CC = gcc
+EXT = 
+BUILD = ./obj
+
+TARGET = spinsim$(EXT)
 
 SOURCES = spinsim.c spininterp.c spindebug.c pasmsim.c pasmdebug.c pasmsim2.c pasmdebug2.c eeprom.c debug.c gdb.c
-OBJECTS = $(SOURCES:.c=.o)
 
 ifneq ($(OS),msys)
 SOURCES += conion.c
 endif
 
-CC = gcc
+OBJECTS = $(patsubst %,$(BUILD)/%, $(SOURCES:.c=.o))
+
 # I'm not sure why these linker flags were being used but the break the build on Mac OS X so I've
 # commented them out for the time being
 #LDFLAGS = -Wl,--relax -Wl,--gc-sections
 LDFLAGS =
 OPT := -O3
-CFLAGS  = -c -g -Wall -Wno-format $(OPT) -I/usr/include -D LINUX
+CFLAGS  = -c -g -Wall -Wno-format $(OPT) -D LINUX
 
-all: $(SOURCES) $(OBJECTS) Makefile
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET)
+all: directory $(SOURCES) $(OBJECTS) Makefile
+	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS)
+
+directory:
+	mkdir -p $(BUILD)
 
 # Compile .c files into objexts .o
-.c.o:
+$(BUILD)/%.o: %.c
 	$(CC) $(CFLAGS) $< -o $@
 
 clean: FORCE