X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.unix;h=85a2f43641eb39851e57276c9dd32849631ce5b6;hb=d8f8063eda45b8dec864b28bb98839a2dd3a8170;hp=c3727361e5ce5fd0ad0a4afdf2a2b483e8f396f3;hpb=a20c0d0f6792acf532309eee2e9f29120c801ee4;p=novacoin.git diff --git a/src/makefile.unix b/src/makefile.unix index c372736..85a2f43 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -1,12 +1,16 @@ # Copyright (c) 2009-2010 Satoshi Nakamoto # Distributed under the MIT/X11 software license, see the accompanying -# file license.txt or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or http://www.opensource.org/licenses/mit-license.php. USE_UPNP:=0 +USE_IPV6:=1 -DEFS=-DNOPCH +LINK:=$(CXX) +ARCH:=$(system lscpu | head -n 1 | awk '{print $2}') -DEFS += $(addprefix -I,$(CURDIR) $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) +DEFS=-DBOOST_SPIRIT_THREADSAFE + +DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) LMODE = dynamic @@ -16,8 +20,6 @@ ifdef STATIC ifeq (${STATIC}, all) LMODE2 = static endif -else - TESTDEFS += -DBOOST_TEST_DYN_LINK endif # for boost 1.37, add -mt to the boost libraries @@ -39,6 +41,10 @@ ifneq (${USE_UPNP}, -) DEFS += -DUSE_UPNP=$(USE_UPNP) endif +ifneq (${USE_IPV6}, -) + DEFS += -DUSE_IPV6=$(USE_IPV6) +endif + LIBS+= \ -Wl,-B$(LMODE2) \ -l z \ @@ -64,13 +70,14 @@ LIBS+= \ # Make some important things such as the global offset table read only as soon as # the dynamic linker is finished building it. This will prevent overwriting of addresses # which would later be jumped to. - HARDENING+=-Wl,-z,relro -Wl,-z,now + LDHARDENING+=-Wl,-z,relro -Wl,-z,now # Build position independent code to take advantage of Address Space Layout Randomization # offered by some kernels. # see doc/build-unix.txt for more information. ifdef PIE - HARDENING+=-fPIE -pie + HARDENING+=-fPIE + LDHARDENING+=-pie endif # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in @@ -80,11 +87,24 @@ LIBS+= \ DEBUGFLAGS=-g -CXXFLAGS=-O2 -xCXXFLAGS=-pthread -Wextra -Wno-sign-compare -Wno-char-subscripts -Wno-invalid-offsetof -Wformat -Wformat-security \ + + +ifeq (${ARCH}, i686) + EXT_OPTIONS=-msse2 +endif + + +# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only +# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. +xCXXFLAGS=-O2 $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) +# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only +# adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. +xLDFLAGS=$(LDHARDENING) $(LDFLAGS) + OBJS= \ + obj/alert.o \ obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ @@ -95,55 +115,90 @@ OBJS= \ obj/init.o \ obj/irc.o \ obj/keystore.o \ + obj/miner.o \ obj/main.o \ obj/net.o \ obj/protocol.o \ obj/bitcoinrpc.o \ obj/rpcdump.o \ + obj/rpcnet.o \ + obj/rpcmining.o \ + obj/rpcwallet.o \ + obj/rpcblockchain.o \ + obj/rpcrawtransaction.o \ obj/script.o \ + obj/sync.o \ obj/util.o \ obj/wallet.o \ - obj/noui.o - - -all: bitcoind + obj/walletdb.o \ + obj/noui.o \ + obj/kernel.o \ + obj/pbkdf2.o \ + obj/scrypt.o \ + obj/scrypt-arm.o \ + obj/scrypt-x86.o \ + obj/scrypt-x86_64.o \ + obj/zerocoin/Accumulator.o \ + obj/zerocoin/AccumulatorProofOfKnowledge.o \ + obj/zerocoin/Coin.o \ + obj/zerocoin/CoinSpend.o \ + obj/zerocoin/Commitment.o \ + obj/zerocoin/ParamGeneration.o \ + obj/zerocoin/Params.o \ + obj/zerocoin/SerialNumberSignatureOfKnowledge.o \ + obj/zerocoin/SpendMetaData.o \ + obj/zerocoin/ZeroTest.o + +all: novacoind + +LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a +DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) +DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) +OBJS += obj/txdb-leveldb.o +leveldb/libleveldb.a: + @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; +obj/txdb-leveldb.o: leveldb/libleveldb.a # auto-generated dependencies: -include obj/*.P --include obj-test/*.P -build.h: FORCE - @../share/genbuild.sh build.h +obj/build.h: FORCE + /bin/sh ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h DEFS += -DHAVE_BUILD_INFO -obj/%.o: %.cpp +obj/scrypt-x86.o: scrypt-x86.S + $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< + +obj/scrypt-x86_64.o: scrypt-x86_64.S + $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< + +obj/scrypt-arm.o: scrypt-arm.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< + +obj/%.o: %.cpp + $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ rm -f $(@:%.o=%.d) -bitcoind: build.h $(OBJS:obj/%=obj/%) - $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) - -TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) - -obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -o $@ $< +obj/zerocoin/%.o: zerocoin/%.cpp + $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ rm -f $(@:%.o=%.d) -test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(LDFLAGS) $(LIBS) +novacoind: $(OBJS:obj/%=obj/%) + $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) clean: - -rm -f bitcoind test_bitcoin + -rm -f novacoind -rm -f obj/*.o - -rm -f obj-test/*.o + -rm -f obj/zerocoin/*.o -rm -f obj/*.P - -rm -f obj-test/*.P - -rm -f src/build.h + -rm -f obj/zerocoin/*.P + -rm -f obj/build.h FORCE: