aboutsummaryrefslogtreecommitdiff
path: root/src/makefile.osx
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2011-07-05 18:19:34 +0200
committerMatt Corallo <matt@bluematt.me>2011-07-05 18:19:34 +0200
commit3f0950ea019ad43c2a8fc79c2aa61845003bd4dc (patch)
tree1a89168de277b50121eef8c06f43e46999447ff7 /src/makefile.osx
parent9390431ce49893cbdf23846edb4bdf72b3d4e830 (diff)
Revert "Make UPnP default on Bitcoin but not on Bitcoind."
This reverts commit ee1f884229736da6f5443157ccba97f4e8f50f82. Stupid, stupid me...there is exactly 0 way to convince make to execute a conditional based on a target-specific variable.
Diffstat (limited to 'src/makefile.osx')
-rw-r--r--src/makefile.osx17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/makefile.osx b/src/makefile.osx
index 36890f9868..784596b72d 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -16,6 +16,8 @@ LIBPATHS= \
WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
+USE_UPNP:=0
+
LIBS= -dead_strip \
$(DEPSDIR)/lib/libdb_cxx-4.8.a \
$(DEPSDIR)/lib/libboost_system.a \
@@ -47,17 +49,10 @@ OBJS= \
cryptopp/obj/sha.o \
cryptopp/obj/cpu.o
-bitcoin: USE_UPNP:=1
- ifdef USE_UPNP
- LIBS += $(DEPSDIR)/lib/libminiupnpc.a
- DEFS += -DUSE_UPNP=$(USE_UPNP)
- endif
-
-bitcoind: USE_UPNP:=0
- ifdef USE_UPNP
- LIBS += $(DEPSDIR)/lib/libminiupnpc.a
- DEFS += -DUSE_UPNP=$(USE_UPNP)
- endif
+ifdef USE_UPNP
+ LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+ DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
all: bitcoin