diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-20 14:43:31 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-20 14:43:31 -0500 |
| commit | 595925592d36fb5d5d34beea3c3e71fca2b6726e (patch) | |
| tree | e28c34353aa08a6f3c0368a39982970c08245ea3 /src/makefile.osx | |
| parent | f06e3e0ea6c8da90585a9f0936c390659dcece37 (diff) | |
| parent | 77f21f1583deb89bf3fffe80fe9b181fedb1dd60 (diff) | |
Merge branch 'op_eval'
Diffstat (limited to 'src/makefile.osx')
| -rw-r--r-- | src/makefile.osx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/makefile.osx b/src/makefile.osx index 4b0b521a33..bd72e6bc03 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -10,6 +10,7 @@ CXX=llvm-g++ DEPSDIR=/opt/local INCLUDEPATHS= \ + -I"$(CURDIR)" \ -I"$(DEPSDIR)/include" \ -I"$(DEPSDIR)/include/db48" @@ -112,6 +113,8 @@ obj/nogui/%.o: %.cpp bitcoind: $(OBJS:obj/%=obj/nogui/%) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) +TESTOBJS := $(patsubst test/%.cpp,obj/test/%.o,$(wildcard test/*.cpp)) + obj/test/%.o: test/%.cpp $(CXX) -c $(CFLAGS) -MMD -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ @@ -119,7 +122,7 @@ obj/test/%.o: test/%.cpp -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ rm -f $(@:%.o=%.d) -test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) +test_bitcoin: $(TESTOBJS) $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a clean: |