diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-07-05 18:19:34 +0200 |
|---|---|---|
| committer | Matt Corallo <matt@bluematt.me> | 2011-07-05 18:19:34 +0200 |
| commit | 3f0950ea019ad43c2a8fc79c2aa61845003bd4dc (patch) | |
| tree | 1a89168de277b50121eef8c06f43e46999447ff7 /src/makefile.unix | |
| parent | 9390431ce49893cbdf23846edb4bdf72b3d4e830 (diff) | |
| download | bitcoin-3f0950ea019ad43c2a8fc79c2aa61845003bd4dc.tar.xz | |
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.unix')
| -rw-r--r-- | src/makefile.unix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 82d2a9f5c1..bb26bf5edd 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -8,6 +8,8 @@ WXINCLUDEPATHS=$(shell wx-config --cxxflags) WXLIBS=$(shell wx-config --libs) +USE_UPNP:=0 + DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL # for boost 1.37, add -mt to the boost libraries @@ -21,17 +23,10 @@ LIBS= \ -l ssl \ -l crypto -bitcoin: USE_UPNP:=1 - ifdef USE_UPNP - LIBS += -l miniupnpc - DEFS += -DUSE_UPNP=$(USE_UPNP) - endif - -bitcoind: USE_UPNP:=0 - ifdef USE_UPNP - LIBS += -l miniupnpc - DEFS += -DUSE_UPNP=$(USE_UPNP) - endif +ifdef USE_UPNP + LIBS += -l miniupnpc + DEFS += -DUSE_UPNP=$(USE_UPNP) +endif LIBS+= \ -Wl,-Bdynamic \ |