Merge branch '20130530_portablecpu' into bfgminer

Makefile.am

@@ -87,15 +87,11 @@ bfgminer_SOURCES	+= \
 		  sha256_sse4_amd64.c 	\
 		  sha256_altivec_4way.c
 
-bfgminer_LDADD += libsse2cpuminer.a
-noinst_LIBRARIES = libsse2cpuminer.a
-libsse2cpuminer_a_SOURCES = sha256_4way.c sha256_sse2_i386.c
-libsse2cpuminer_a_CFLAGS = $(bfgminer_CPPFLAGS) -msse2
-
 # the CPU portion extracted from original main.c
 bfgminer_SOURCES += driver-cpu.h driver-cpu.c
 
 if HAS_YASM
+
 AM_CFLAGS	= -DHAS_YASM
 if HAVE_x86_64
 SUBDIRS		+= x86_64
@@ -103,6 +99,12 @@ bfgminer_LDADD	+= x86_64/libx8664.a
 else # HAVE_x86_64
 SUBDIRS		+= x86_32
 bfgminer_LDADD	+= x86_32/libx8632.a
+
+bfgminer_LDADD += libsse2cpuminer.a
+noinst_LIBRARIES = libsse2cpuminer.a
+libsse2cpuminer_a_SOURCES = sha256_4way.c sha256_sse2_i386.c
+libsse2cpuminer_a_CFLAGS = $(bfgminer_CPPFLAGS) -msse2
+
 endif # HAVE_x86_64
 endif # HAS_YASM
 endif # HAS_CPUMINE