From bdf6d65a4e4a31c64b7386d544ba968a3a03b6a3 Mon Sep 17 00:00:00 2001 From: MASM fan Date: Sun, 3 Aug 2014 03:29:03 +0400 Subject: [PATCH] Fix daemon makefiles syntax --- src/makefile.bsd | 2 +- src/makefile.linux-mingw | 2 +- src/makefile.mingw | 2 +- src/makefile.osx | 2 +- src/makefile.unix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/makefile.bsd b/src/makefile.bsd index cd9b2b4..1170153 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -154,7 +154,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: -@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; + @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; obj/txdb-leveldb.o: leveldb/libleveldb.a endif ifneq (${USE_LEVELDB}, 1) diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index baa9db6..a194bf5 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -116,7 +116,7 @@ DEFS += -I"$(CURDIR)/leveldb/include" -DUSE_LEVELDB DEFS += -I"$(CURDIR)/leveldb/helpers" OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: -@echo "Building LevelDB ..." && cd leveldb && CC=$(CC) CXX=$(CXX) TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$(INCLUDEPATHS)" LDFLAGS="-L$(LIBPATHS)" $(MAKE) libleveldb.a libmemenv.a && $(RANLIB) libleveldb.a && $(RANLIB) libmemenv.a && cd .. + @echo "Building LevelDB ..." && cd leveldb && CC=$(CC) CXX=$(CXX) TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$(INCLUDEPATHS)" LDFLAGS="-L$(LIBPATHS)" $(MAKE) libleveldb.a libmemenv.a && $(RANLIB) libleveldb.a && $(RANLIB) libmemenv.a && cd .. obj/txdb-leveldb.o: leveldb/libleveldb.a else OBJS += obj/txdb-bdb.o diff --git a/src/makefile.mingw b/src/makefile.mingw index 5d4a831..3615141 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -107,7 +107,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: -cd leveldb; make; cd .. + cd leveldb; make; cd .. obj/txdb-leveldb.o: leveldb/libleveldb.lib else OBJS += obj/txdb-bdb.o diff --git a/src/makefile.osx b/src/makefile.osx index 201351c..3cd0962 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -134,7 +134,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: -@echo "Building LevelDB ..."; cd leveldb; make; cd .. + @echo "Building LevelDB ..."; cd leveldb; make; cd .. obj/txdb-leveldb.o: leveldb/libleveldb.a else OBJS += obj/txdb-bdb.o diff --git a/src/makefile.unix b/src/makefile.unix index 4e36759..6511849 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -160,7 +160,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: -@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; + @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; obj/txdb-leveldb.o: leveldb/libleveldb.a endif ifneq (${USE_LEVELDB}, 1) -- 1.7.1