diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-31 17:06:38 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-31 17:06:38 +0200 |
commit | f43f46c175d7e6d7426536f8efcad05d2eafba80 (patch) | |
tree | c0d2aba4ef565613c2b471058b490ac59f2e17bd /src/makefile.unix | |
parent | 6c85cbecf1198d1052c9835ff7e23bb2966d9503 (diff) | |
parent | 829e21733b1c232c79c1a2d10598eb47b2f5f7f9 (diff) | |
download | bitcoin-f43f46c175d7e6d7426536f8efcad05d2eafba80.tar.xz |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/makefile.unix')
-rw-r--r-- | src/makefile.unix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 4c92797292..597eea0dc8 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -77,8 +77,8 @@ obj/nogui/%.o: %.cpp $(HEADERS) bitcoind: $(OBJS:obj/%=obj/nogui/%) $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) -obj/test/%.o: test/%.cpp $(HEADERS) - $(CXX) -c $(CXXFLAGS) -o $@ $< +obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS) + $(CXX) -c $(CFLAGS) -o $@ test/test_bitcoin.cpp test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) $(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS) |