Use prebuilt leveldb

diff --git a/src/additional/leveldb b/src/additional/leveldb
new file mode 160000 (submodule)
index 0000000..e426c83
--- /dev/null
+++ b/src/additional/leveldb
@@ -0,0 +1 @@
+Subproject commit e426c83e88c4babc785098d905c2dcb4f4e884af

diff --git a/src/makefile.bsd b/src/makefile.bsd
index b7920d7..4591947 100644 (file)
--- a/src/makefile.bsd
+++ b/src/makefile.bsd
@@ -144,13 +144,10 @@ all: novacoind
 # LevelDB support
 #
 ifeq (${USE_LEVELDB}, 1)
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+LIBS += $(CURDIR)/additional/stage/usr/lib/libleveldb.a
+DEFS += -DUSE_LEVELDB
+DEFS += $(addprefix -I,$(CURDIR)/additional/leveldb/helpers)
 OBJS += obj/txdb-leveldb.o
-leveldb/libleveldb.a:
-       @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) gmake libleveldb.a libmemenv.a; cd ..;
-obj/txdb-leveldb.o: leveldb/libleveldb.a
 endif
 ifneq (${USE_LEVELDB}, 1)
 OBJS += obj/txdb-bdb.o

diff --git a/src/makefile.mingw b/src/makefile.mingw
index dc3c476..dad85f7 100644 (file)
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -99,13 +99,10 @@ all: novacoind.exe
 # LevelDB support
 #
 ifdef USE_LEVELDB
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+LIBS += $(CURDIR)/additional/stage/usr/lib/libleveldb.a
+DEFS += -DUSE_LEVELDB
+DEFS += $(addprefix -I,$(CURDIR)/additional/leveldb/helpers)
 OBJS += obj/txdb-leveldb.o
-leveldb/libleveldb.a:
-       cd leveldb;TARGET_OS=NATIVE_WINDOWS make libleveldb.a libmemenv.a;; cd ..
-obj/txdb-leveldb.o: leveldb/libleveldb.a
 else
 OBJS += obj/txdb-bdb.o
 endif

diff --git a/src/makefile.osx b/src/makefile.osx
index 394e157..66b47dc 100644 (file)
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -113,13 +113,10 @@ all: novacoind
 # LevelDB support
 #
 ifdef USE_LEVELDB
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+LIBS += $(CURDIR)/additional/stage/usr/lib/libleveldb.a
+DEFS += $(addprefix -I,$(CURDIR)/additional/stage/usr/include) -DUSE_LEVELDB
+DEFS += $(addprefix -I,$(CURDIR)/additional/leveldb/helpers)
 OBJS += obj/txdb-leveldb.o
-leveldb/libleveldb.a:
-       @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) make; cd ..
-obj/txdb-leveldb.o: leveldb/libleveldb.a
 else
 OBJS += obj/txdb-bdb.o
 endif

diff --git a/src/makefile.unix b/src/makefile.unix
index 90f307b..05605a2 100644 (file)
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -145,13 +145,10 @@ all: novacoind
 # LevelDB support
 #
 ifeq (${USE_LEVELDB}, 1)
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+LIBS += $(CURDIR)/additional/stage/usr/lib/libleveldb.a
+DEFS += -DUSE_LEVELDB
+DEFS += $(addprefix -I,$(CURDIR)/additional/leveldb/helpers)
 OBJS += obj/txdb-leveldb.o
-leveldb/libleveldb.a:
-       @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) make libleveldb.a libmemenv.a; cd ..;
-obj/txdb-leveldb.o: leveldb/libleveldb.a
 endif
 ifneq (${USE_LEVELDB}, 1)
 OBJS += obj/txdb-bdb.o