--- a/test/Makefile	Tue Mar 16 12:12:57 2010 +0100
+++ b/test/Makefile	Sat Apr 17 04:25:27 2010 -0400
@@ -2,9 +2,12 @@
 CXXFLAGS=$(CFLAGS)
 LDFLAGS=-Wl,--warn-unresolved-symbols -L.
 LINKER=$(CC)
+MACHINE_MAKEFILE=Makefile.$(shell uname -p)
 
-TESTS=test0 test0_1 test0_2 test1 test2 test3 test4 test5 test6 test7 test8 test8_5 test9 test10 test11 test15 test12 test13 test14 test16 test17 test18 test19 test21 test22
-TARGETS=hello libq.so libp.so libn.so libo.so circular-dep libl.so libk.so libj.so libi.so libh.so libg.so libf.so libe.so libd.so libb.so liba.so libefl.so lb22.so \
+include $(MACHINE_MAKEFILE)
+
+TESTS=test0 test0_1 test0_2 test1 test2 test3 test4 test5 test6 test7 test8 test8_5 test9 test10 test11 test15 test12 test13 test14 test16 test17 test18 test19 test21 $(TEST64)
+TARGETS=hello libq.so libp.so libn.so libo.so circular-dep libl.so libk.so libj.so libi.so libh.so libg.so libf.so libe.so libd.so libb.so liba.so libefl.so $(LIB64) \
  $(TESTS) $(addsuffix -ldso,$(TESTS))
 
 all: $(TARGETS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/Makefile.i686	Sat Apr 17 04:25:27 2010 -0400
@@ -0,0 +1,2 @@
+TEST64=
+LIB64=

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/Makefile.x86_64	Sat Apr 17 04:25:27 2010 -0400
@@ -0,0 +1,2 @@
+TEST64=test22
+LIB64=lb22.so