LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge branch 'bugfix_shared_boost_test' of https://github.com/luke-jr/bitcoin

Browse source
This commit is contained in:
Gavin Andresen 2012-01-23 15:16:59 -05:00
commit 2a9b46cf4b
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/makefile.unix
View file

@ -16,6 +16,8 @@ ifdef STATIC
ifeq (${STATIC}, all) ifeq (${STATIC}, all)
LMODE2 = static LMODE2 = static
endif endif
else
TESTDEFS += -DBOOST_TEST_DYN_LINK
endif endif
# for boost 1.37, add -mt to the boost libraries # for boost 1.37, add -mt to the boost libraries
@ -109,7 +111,7 @@ all: bitcoind
# auto-generated dependencies: # auto-generated dependencies:
-include obj/*.P -include obj/*.P
-include obj/test/*.P -include obj-test/*.P
obj/%.o: %.cpp obj/%.o: %.cpp
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
@ -121,21 +123,21 @@ obj/%.o: %.cpp
bitcoind: $(OBJS:obj/%=obj/%) bitcoind: $(OBJS:obj/%=obj/%)
$(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj/test/%.o,$(wildcard test/*.cpp)) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj/test/%.o: test/%.cpp obj-test/%.o: test/%.cpp
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \ @cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LDFLAGS) $(LIBS) $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(LDFLAGS) $(LIBS)
clean: clean:
-rm -f bitcoind test_bitcoin -rm -f bitcoind test_bitcoin
-rm -f obj/*.o -rm -f obj/*.o
-rm -f obj/test/*.o -rm -f obj-test/*.o
-rm -f obj/*.P -rm -f obj/*.P
-rm -f obj/test/*.P -rm -f obj-test/*.P

2
src/obj-test/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*
!.gitignore