From 55f693a80ceaa62fd71064ef02f70fadcf56eaeb Mon Sep 17 00:00:00 2001
From: ckolivas <kernel@kolivas.org>
Date: Sat, 4 Feb 2012 09:59:20 +1100
Subject: [PATCH] Revert Makefile.am component for easier merge of upcoming
 changes.

---
 Makefile.am | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 116abdc5..d7614172 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,14 +17,27 @@ INCLUDES	= $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
 
 bin_PROGRAMS	= cgminer
 
-bin_SCRIPTS	= phatk120203.cl poclbm120203.cl
+bin_SCRIPTS	= phatk110817.cl poclbm110817.cl
 
+if HAS_CPUMINE
 cgminer_SOURCES	= elist.h miner.h compat.h bench_block.h	\
 		  main.c util.c uthash.h			\
 		  ocl.c ocl.h findnonce.c findnonce.h 		\
+		  sha256_generic.c sha256_4way.c sha256_via.c	\
+		  sha256_cryptopp.c sha256_sse2_amd64.c		\
+		  sha256_sse4_amd64.c sha256_sse2_i386.c	\
+		  sha256_altivec_4way.c				\
 		  adl.c	adl.h adl_functions.h			\
-		  phatk120203.cl poclbm120203.cl \
+		  phatk110817.cl poclbm110817.cl \
 		  sha2.c sha2.h api.c
+else
+cgminer_SOURCES	= elist.h miner.h compat.h bench_block.h	\
+		  main.c util.c uthash.h			\
+		  ocl.c ocl.h findnonce.c findnonce.h 		\
+		  adl.c	adl.h adl_functions.h			\
+		  phatk110817.cl poclbm110817.cl \
+		  sha2.c sha2.h api.c
+endif
 
 cgminer_LDFLAGS	= $(PTHREAD_FLAGS)
 cgminer_LDADD	= $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
@@ -33,11 +46,6 @@ cgminer_LDADD	= $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
 cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@
 
 if HAS_CPUMINE
-cgminer_SOURCES += sha256_generic.c sha256_4way.c sha256_via.c	\
-		   sha256_cryptopp.c sha256_sse2_amd64.c		\
-		   sha256_sse4_amd64.c sha256_sse2_i386.c	\
-		   sha256_altivec_4way.c
-
 if HAVE_x86_64
 if HAS_YASM
 SUBDIRS		+= x86_64