Merge commit '2104982' into bfgminer-3.10.x

Makefile.am

@@ -74,8 +74,10 @@ bfgminer_SOURCES += miner.h compat.h  \
 		   sha2.c sha2.h api.c
 EXTRA_bfgminer_DEPENDENCIES =
 
+SUBDIRS += $(LIBBLKMAKER_SUBDIRS)
+LIBBLKMAKER_SUBDIRS =
 if NEED_LIBBLKMAKER
-SUBDIRS           += libblkmaker
+LIBBLKMAKER_SUBDIRS         += libblkmaker
 EXTRA_bfgminer_DEPENDENCIES += libblkmaker_directory
 libblkmaker_directory:
 	cd libblkmaker && $(MAKE)