Browse Source

Update to use automake for libblkmaker

Luke Dashjr 13 years ago
parent
commit
19a3858094
3 changed files with 5 additions and 6 deletions
  1. 2 5
      Makefile.am
  2. 2 0
      configure.ac
  3. 1 1
      libblkmaker

+ 2 - 5
Makefile.am

@@ -36,12 +36,9 @@ bfgminer_SOURCES	+= elist.h miner.h compat.h bench_block.h	\
 		   sha2.c sha2.h api.c
 
 if NEED_LIBBLKMAKER
-bfgminer_LDADD    += libblkmaker/libblkmaker.so libblkmaker/libblkmaker_jansson.so
+SUBDIRS           += libblkmaker
 bfgminer_CPPFLAGS += -Ilibblkmaker
-bfgminer_LDFLAGS  += -Llibblkmaker -Wl,-rpath,libblkmaker -lblkmaker -lblkmaker_jansson
-
-libblkmaker/libblkmaker.so libblkmaker/libblkmaker_jansson.so:
-	cd libblkmaker && $(MAKE) $(AM_MAKEFLAGS) CFLAGS="$(CFLAGS)" CC="$(CC)" $(@:libblkmaker/%=%)
+bfgminer_LDFLAGS  += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs -lblkmaker-0.1 -lblkmaker_jansson-0.1
 endif
 
 bfgminer_SOURCES	+= logging.c

+ 2 - 0
configure.ac

@@ -248,6 +248,8 @@ else
 fi
 
 
+AC_CONFIG_SUBDIRS([libblkmaker])
+
 AM_CONDITIONAL([NEED_LIBBLKMAKER], [true])
 AM_CONDITIONAL([NEED_FPGAUTILS], [test x$icarus$bitforce$modminer$ztex != xnononono])
 AM_CONDITIONAL([HAS_SCRYPT], [test x$scrypt = xyes])

+ 1 - 1
libblkmaker

@@ -1 +1 @@
-Subproject commit 3ffaa3bb62b59a48b0cf6c6b940b2f78c391f0d4
+Subproject commit 20a7bacec22b475444a365d77035e6c07c972cef