aboutsummaryrefslogtreecommitdiff
path: root/src/makefile.osx
diff options
context:
space:
mode:
authorCory Fields <theuni-nospam-@xbmc.org>2013-05-26 13:48:30 -0400
committerCory Fields <theuni-nospam-@xbmc.org>2013-06-04 03:54:14 -0400
commitc862d2ff22f06cb15fb9492b9f0b69e3d91a7e44 (patch)
tree9c42a039cebd847704637de61d6f08e942f86f82 /src/makefile.osx
parenta9380c72bee0fc134a2215d7919b52936bd8158d (diff)
downloadbitcoin-c862d2ff22f06cb15fb9492b9f0b69e3d91a7e44.tar.xz
build: split the non-gui startup routines into a new file
This will allow each to have its own main(), meaning that we can build a common base client and simply link in the correct startup object to create the appropriate binary.
Diffstat (limited to 'src/makefile.osx')
-rw-r--r--src/makefile.osx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/makefile.osx b/src/makefile.osx
index 50279fdb05..4ee0edcb95 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -82,6 +82,7 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
+ obj/bitcoind.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
@@ -162,7 +163,7 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
-test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
clean: