diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-04-11 10:35:44 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-04-11 10:35:44 -0700 |
| commit | 37e7e72041686682b1014157dd8a177f65189368 (patch) | |
| tree | 26d167d58d718989cdf009f3ab1d3417e53d3034 | |
| parent | 5d464a4a5552acd1fe7e6c9ba656f0d809ebcd44 (diff) | |
| parent | 45771671704f0ed09aec48777c12f0af388d1beb (diff) | |
Merge pull request #1077 from sipa/buildinfo
Fix build.h dependencies
| -rw-r--r-- | bitcoin-qt.pro | 6 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 10 | ||||
| -rw-r--r-- | src/makefile.osx | 8 | ||||
| -rw-r--r-- | src/makefile.unix | 9 |
4 files changed, 19 insertions, 14 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 6c8ebdc156..a3b42cdc2b 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -83,9 +83,9 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { # regenerate src/build.h !windows || contains(USE_BUILD_INFO, 1) { genbuild.depends = FORCE - genbuild.commands = share/genbuild.sh src/build.h - genbuild.target = src/build.h - "src/version.cpp".depends += src/build.h + genbuild.commands = cd $$PWD; share/genbuild.sh $$OUT_PWD/build/build.h + genbuild.target = genbuildhook + PRE_TARGETDEPS += genbuildhook QMAKE_EXTRA_TARGETS += genbuild DEFINES += HAVE_BUILD_INFO } diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 4922df599b..9f005424f6 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -10,7 +10,8 @@ INCLUDEPATHS= \ -I"$(DEPSDIR)/boost_1_47_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.0e/include" \ - -I"$(DEPSDIR)" + -I"$(DEPSDIR)" \ + -I"$(CURDIR)"/obj \ LIBPATHS= \ -L"$(DEPSDIR)/boost_1_47_0/stage/lib" \ @@ -65,14 +66,15 @@ OBJS= \ all: bitcoind.exe -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 $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: build.h $(OBJS:obj/%=obj/%) +bitcoind.exe: $(OBJS:obj/%=obj/%) i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) diff --git a/src/makefile.osx b/src/makefile.osx index 439d8ef21b..c5d3edbdc9 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -11,6 +11,7 @@ DEPSDIR=/opt/local INCLUDEPATHS= \ -I"$(CURDIR)" \ + -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/include" \ -I"$(DEPSDIR)/include/db48" @@ -100,8 +101,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 @@ -111,7 +113,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) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) 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)) |