Mercurial > hg > bitcoin

diff src/makefile.unix @ 744:e98b41d99e48 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Matt Corallo <matt@bluematt.me>
date Tue, 05 Jul 2011 18:19:34 +0200
parents 53efc26fbf15
children fd7e5b1cfc08
line wrap: on
line diff
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -8,6 +8,8 @@
 
 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 @@
    -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 \