diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-11 03:51:08 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-11 14:04:42 +0200 |
| commit | 45771671704f0ed09aec48777c12f0af388d1beb (patch) | |
| tree | 26d167d58d718989cdf009f3ab1d3417e53d3034 /src/makefile.unix | |
| parent | 5d464a4a5552acd1fe7e6c9ba656f0d809ebcd44 (diff) | |
| download | bitcoin-45771671704f0ed09aec48777c12f0af388d1beb.tar.xz | |
Fix build.h dependencies
For Qt builds, the build.h file is moved to build/build.h. For regular
builds, it is moved to obj/build.h. This allows the Qt build to be done
in a different directory than the source, and without interfering with
other builds.
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index c3727361e5..79251dc7a6 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -6,7 +6,7 @@ USE_UPNP:=0 DEFS=-DNOPCH -DEFS += $(addprefix -I,$(CURDIR) $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) +DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) LMODE = dynamic @@ -112,8 +112,9 @@ all: bitcoind -include obj/*.P -include obj-test/*.P -build.h: FORCE - @../share/genbuild.sh build.h +obj/build.h: FORCE + ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h DEFS += -DHAVE_BUILD_INFO obj/%.o: %.cpp @@ -123,7 +124,7 @@ obj/%.o: %.cpp -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ rm -f $(@:%.o=%.d) -bitcoind: build.h $(OBJS:obj/%=obj/%) +bitcoind: $(OBJS:obj/%=obj/%) $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) |