From 4a290b526cb064fd698ddb339f6da820d5a60d86 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 12 Nov 2013 20:09:55 +0000 Subject: Cleanup LevelDB library dependencies --- src/Makefile.include | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/Makefile.include') diff --git a/src/Makefile.include b/src/Makefile.include index b9e6c262c..dae7db780 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -1,23 +1,30 @@ +if EMBEDDED_LEVELDB +LEVELDB_CPPFLAGS += -I$(top_srcdir)/src/leveldb/include +LEVELDB_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv +LIBLEVELDB += $(top_builddir)/src/leveldb/libleveldb.a +LIBMEMENV += $(top_builddir)/src/leveldb/libmemenv.a +endif + AM_CPPFLAGS = $(INCLUDES) \ -I$(top_builddir)/src/obj \ - -I$(top_srcdir)/src/leveldb/include \ $(BDB_CPPFLAGS) \ $(BOOST_INCLUDES) +AM_CPPFLAGS += $(LEVELDB_CPPFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) LIBBITCOIN_SERVER=$(top_builddir)/src/libbitcoin_server.a LIBBITCOIN_WALLET=$(top_builddir)/src/libbitcoin_wallet.a LIBBITCOIN_COMMON=$(top_builddir)/src/libbitcoin_common.a LIBBITCOIN_CLI=$(top_builddir)/src/libbitcoin_cli.a -LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a -LIBMEMENV=$(top_builddir)/src/leveldb/libmemenv.a LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a $(LIBBITCOIN): $(MAKE) -C $(top_builddir)/src $(@F) +if EMBEDDED_LEVELDB $(LIBLEVELDB) $(LIBMEMENV): $(MAKE) -C $(top_builddir)/src leveldb/$(@F) +endif $(LIBBITCOINQT): $(MAKE) -C $(top_builddir)/src/qt $(@F) -- cgit v1.2.3 From 2041365c8c2d0f8e83715b2a643c3fd2cf6eb4cb Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 22 Nov 2013 12:32:36 +0000 Subject: Bugfix: Use BOOST_CPPFLAGS when testing for boost sleep vs sleep_for --- src/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.include') diff --git a/src/Makefile.include b/src/Makefile.include index dae7db780..01b47d1aa 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -8,7 +8,7 @@ endif AM_CPPFLAGS = $(INCLUDES) \ -I$(top_builddir)/src/obj \ $(BDB_CPPFLAGS) \ - $(BOOST_INCLUDES) + $(BOOST_CPPFLAGS) $(BOOST_INCLUDES) AM_CPPFLAGS += $(LEVELDB_CPPFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) -- cgit v1.2.3