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.osx | |
| parent | 5d464a4a5552acd1fe7e6c9ba656f0d809ebcd44 (diff) | |
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.osx')
| -rw-r--r-- | src/makefile.osx | 8 |
1 files changed, 5 insertions, 3 deletions
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)) |