aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2011-10-09 14:23:20 -0400
committerLuke Dashjr <luke-jr+git@utopios.org>2011-10-09 14:23:20 -0400
commitb4d0588d06e7c2746b624128b3cc4596459ddf87 (patch)
tree43ab1b66a50941377ad9afdd27d1e341300315ac /src
parent4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff)
Add support to makefile.unix for the same parameters used by bitcoin-qt.pro, dynamic linking unless STATIC=1 is passed
Diffstat (limited to 'src')
-rw-r--r--src/makefile.unix37
1 files changed, 28 insertions, 9 deletions
diff --git a/src/makefile.unix b/src/makefile.unix
index 1ef7caaad7..0e903ef18e 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -6,26 +6,45 @@ CXX=g++
USE_UPNP:=0
-DEFS=-DNOPCH -DUSE_SSL
+DEFS=-DNOPCH
+
+DEFS += $(addprefix -I,$(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
+LIBS += $(addprefix -l,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
+
+LMODE = dynamic
+LMODE2 = dynamic
+ifdef STATIC
+ LMODE = static
+ ifeq (${STATIC}, all)
+ LMODE2 = static
+ endif
+endif
# for boost 1.37, add -mt to the boost libraries
LIBS= \
- -Wl,-Bstatic \
- -l boost_system \
- -l boost_filesystem \
- -l boost_program_options \
- -l boost_thread \
- -l db_cxx \
+ -Wl,-B$(LMODE) \
+ -l boost_system$(BOOST_LIB_SUFFIX) \
+ -l boost_filesystem$(BOOST_LIB_SUFFIX) \
+ -l boost_program_options$(BOOST_LIB_SUFFIX) \
+ -l boost_thread$(BOOST_LIB_SUFFIX) \
+ -l db_cxx$(BDB_LIB_SUFFIX) \
-l ssl \
-l crypto
-ifdef USE_UPNP
+ifndef USE_UPNP
+ override USE_UPNP = -
+endif
+ifneq (${USE_UPNP}, -)
LIBS += -l miniupnpc
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
+ifneq (${USE_SSL}, 0)
+ DEFS += -DUSE_SSL
+endif
+
LIBS+= \
- -Wl,-Bdynamic \
+ -Wl,-B$(LMODE2) \
-l gthread-2.0 \
-l z \
-l dl \