Mercurial > hg > bitcoin
changeset 2203:7b9590e1065e draft
Merge pull request #1077 from sipa/buildinfo
Fix build.h dependencies
| author | Gavin Andresen <gavinandresen@gmail.com> |
|---|---|
| date | Wed, 11 Apr 2012 10:35:44 -0700 |
| parents | 14d7d2ac950d (current diff) 487d534d3d78 (diff) |
| children | a33a8809b933 8a17a73180e3 |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -83,9 +83,9 @@ # 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 }
--- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -10,7 +10,8 @@ -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 @@ 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)
--- a/src/makefile.osx +++ b/src/makefile.osx @@ -11,6 +11,7 @@ INCLUDEPATHS= \ -I"$(CURDIR)" \ + -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/include" \ -I"$(DEPSDIR)/include/db48" @@ -100,8 +101,9 @@ -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 @@ -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))
--- a/src/makefile.unix +++ b/src/makefile.unix @@ -6,7 +6,7 @@ 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 @@ -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 @@ -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))