diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-10 08:20:28 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-10 08:20:28 -0700 |
| commit | ab877a2dde2ad96d3719acf6ed39ef4eae9b1ef4 (patch) | |
| tree | de696fbf22f998d5e79b3b938ff1509a06bdc0c2 /src | |
| parent | b50ac8f73e3e3aa47be567f3fcd5b7c8933c49db (diff) | |
| parent | b4d0588d06e7c2746b624128b3cc4596459ddf87 (diff) | |
| download | bitcoin-ab877a2dde2ad96d3719acf6ed39ef4eae9b1ef4.tar.xz | |
Merge pull request #576 from luke-jr/bitcoind_build_improvements
bitcoind build improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.unix | 37 |
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 \ |