Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis fixes WIP #91

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Travis fixes WIP #91

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ffa28a
Add consensus/joinsplit.h to Makefile.am
Oct 15, 2018
e83254f
Fix snark path in Makefile.am
ch4ot1c Oct 15, 2018
529c33a
Add wallet/joinsplit.h to Makefile.am
ch4ot1c Oct 15, 2018
dc87b9e
Snark in makefile
ch4ot1c Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ if HAVE_OPENMP
LIBSNARK_CONFIG_FLAGS += MULTICORE=1
endif

$(LIBSNARK): $(wildcard snark/src/*)
$(LIBSNARK): $(wildcard snark/libsnark/*)
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"

libsnark-tests: $(wildcard snark/src/*)
libsnark-tests: $(wildcard snark/libsnark/*)
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"

# Make is not made aware of per-object dependencies to avoid limiting building parallelization
Expand Down Expand Up @@ -127,6 +127,7 @@ BITCOIN_CORE_H = \
compressor.h \
consensus/consensus.h \
consensus/tx_verify.h \
consensus/joinsplit.h \
core_io.h \
core_memusage.h \
cuckoocache.h \
Expand Down Expand Up @@ -211,6 +212,7 @@ BITCOIN_CORE_H = \
wallet/walletdb.h \
wallet/walletutil.h \
wallet/coinselection.h \
wallet/joinsplit.h \
warnings.h \
zkaddr.h \
zmq/zmqabstractnotifier.h \
Expand Down