Skip to content

Commit

Permalink
Auto merge of zcash#2771 - syd0:fix-snark-dep-build, r=str4d
Browse files Browse the repository at this point in the history 
Fix libsnark dependency build.

This changes libsnark to build in-place, instead of copying first to
a build directory. Previously, modifications made to the original
sources wouldn't get rebuilt without a 'make clean' because users
would be pointing to the copies.

This closes zcash#2689.
  • Loading branch information
@zkbot
zkbot committed Jan 5, 2018
2 parents 8dbe114 + a55c186 commit b2a114a
Show file tree
Hide file tree
Showing 119 changed files with 114 additions and 119 deletions.
16 changes: 5 additions & 11 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)

BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
BITCOIN_INCLUDES += -I$(srcdir)/snark/build/include
BITCOIN_INCLUDES += -I$(srcdir)/snark/build/include/libsnark
BITCOIN_INCLUDES += -I$(srcdir)/snark
BITCOIN_INCLUDES += -I$(srcdir)/snark/libsnark
BITCOIN_INCLUDES += -I$(srcdir)/univalue/include

LIBBITCOIN_SERVER=libbitcoin_server.a
Expand All @@ -34,30 +34,24 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
LIBBITCOIN_UTIL=libbitcoin_util.a
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
LIBSECP256K1=secp256k1/libsecp256k1.la
LIBSNARK=snark/build/lib/libsnark.a
LIBSNARK=snark/libsnark.a
LIBUNIVALUE=univalue/libunivalue.la
LIBZCASH=libzcash.a

$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)

# A phony target is included here to ensure libsnark is built first, so that its
# header files are collated for use in later build steps.
# See https://stackoverflow.com/a/10726725
-include collate-libsnark
collate-libsnark: $(LIBSNARK)

LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all
LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1
if HAVE_OPENMP
LIBSNARK_CONFIG_FLAGS += MULTICORE=1
endif

$(LIBSNARK): $(wildcard snark/src/*)
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"
$(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/*)
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"

$(LIBUNIVALUE): $(wildcard univalue/lib/*)
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/
Expand Down
83 changes: 42 additions & 41 deletions src/snark/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,50 @@
*.a
*.so
*.d
libsnark/gtests
depinst/
depsrc/
README.html
doxygen/
src/gtests
src/gadgetlib2/examples/tutorial
src/gadgetlib2/tests/gadgetlib2_test
libsnark/gtests
libsnark/gadgetlib2/examples/tutorial
libsnark/gadgetlib2/tests/gadgetlib2_test

src/algebra/curves/tests/test_bilinearity
src/algebra/curves/tests/test_groups
src/algebra/fields/tests/test_fields
src/common/routing_algorithms/profiling/profile_routing_algorithms
src/common/routing_algorithms/tests/test_routing_algorithms
src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram
src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget
src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget
src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets
src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets
src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget
src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget
src/reductions/ram_to_r1cs/examples/demo_arithmetization
src/relations/arithmetic_programs/qap/tests/test_qap
src/relations/arithmetic_programs/ssp/tests/test_ssp
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd
src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark
src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark
src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark
src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark
src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark
src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark
src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier
src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark
src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark
src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark
src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark
src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark
src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark
src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark
src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark
libsnark/algebra/curves/tests/test_bilinearity
libsnark/algebra/curves/tests/test_groups
libsnark/algebra/fields/tests/test_fields
libsnark/common/routing_algorithms/profiling/profile_routing_algorithms
libsnark/common/routing_algorithms/tests/test_routing_algorithms
libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram
libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget
libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget
libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets
libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets
libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget
libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget
libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization
libsnark/relations/arithmetic_programs/qap/tests/test_qap
libsnark/relations/arithmetic_programs/ssp/tests/test_ssp
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd
libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark
libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark
libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark
libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark
libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark
libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark
libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark
libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark
134 changes: 67 additions & 67 deletions src/snark/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CXXFLAGS += -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-comment -Wfatal-
DEPSRC = depsrc
DEPINST = depinst

CXXFLAGS += -I$(DEPINST)/include -Isrc
CXXFLAGS += -I$(DEPINST)/include -Ilibsnark
LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib
LDLIBS += -lgmpxx -lgmp -lboost_program_options-mt -lsodium
# List of .a files to include within libsnark.a and libsnark.so:
Expand All @@ -44,80 +44,80 @@ ifneq ($(NO_SUPERCOP),1)
endif

LIB_SRCS = \
src/algebra/curves/alt_bn128/alt_bn128_g1.cpp \
src/algebra/curves/alt_bn128/alt_bn128_g2.cpp \
src/algebra/curves/alt_bn128/alt_bn128_init.cpp \
src/algebra/curves/alt_bn128/alt_bn128_pairing.cpp \
src/algebra/curves/alt_bn128/alt_bn128_pp.cpp \
src/common/profiling.cpp \
src/common/utils.cpp \
src/gadgetlib1/constraint_profiling.cpp \
libsnark/algebra/curves/alt_bn128/alt_bn128_g1.cpp \
libsnark/algebra/curves/alt_bn128/alt_bn128_g2.cpp \
libsnark/algebra/curves/alt_bn128/alt_bn128_init.cpp \
libsnark/algebra/curves/alt_bn128/alt_bn128_pairing.cpp \
libsnark/algebra/curves/alt_bn128/alt_bn128_pp.cpp \
libsnark/common/profiling.cpp \
libsnark/common/utils.cpp \
libsnark/gadgetlib1/constraint_profiling.cpp \

ifeq ($(CURVE),BN128)
LIB_SRCS += \
src/algebra/curves/bn128/bn128_g1.cpp \
src/algebra/curves/bn128/bn128_g2.cpp \
src/algebra/curves/bn128/bn128_gt.cpp \
src/algebra/curves/bn128/bn128_init.cpp \
src/algebra/curves/bn128/bn128_pairing.cpp \
src/algebra/curves/bn128/bn128_pp.cpp
libsnark/algebra/curves/bn128/bn128_g1.cpp \
libsnark/algebra/curves/bn128/bn128_g2.cpp \
libsnark/algebra/curves/bn128/bn128_gt.cpp \
libsnark/algebra/curves/bn128/bn128_init.cpp \
libsnark/algebra/curves/bn128/bn128_pairing.cpp \
libsnark/algebra/curves/bn128/bn128_pp.cpp

CXXFLAGS += -DBN_SUPPORT_SNARK
AR_LIBS += $(DEPINST)/lib/libzm.a
endif

# FIXME: most of these are broken due to removed code.
DISABLED_EXECUTABLES = \
src/common/routing_algorithms/profiling/profile_routing_algorithms \
src/common/routing_algorithms/tests/test_routing_algorithms \
src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram \
src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget \
src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets \
src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget \
src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget \
src/reductions/ram_to_r1cs/examples/demo_arithmetization \
src/relations/arithmetic_programs/ssp/tests/test_ssp \
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd \
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd \
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd \
src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd \
src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark \
src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark \
src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark \
src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark \
src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark \
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark \
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator \
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover \
src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier \
src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark \
src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark \
src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark \
src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark \
src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark \
src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark \
src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark \
src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark
libsnark/common/routing_algorithms/profiling/profile_routing_algorithms \
libsnark/common/routing_algorithms/tests/test_routing_algorithms \
libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram \
libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget \
libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets \
libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget \
libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget \
libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization \
libsnark/relations/arithmetic_programs/ssp/tests/test_ssp \
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd \
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd \
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd \
libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd \
libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator \
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover \
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier \
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark \
libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark \
libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark \
libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark

EXECUTABLES =

EXECUTABLES_WITH_GTEST =

EXECUTABLES_WITH_SUPERCOP = \
src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark
libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark

GTEST_TESTS = src/gtests
GTEST_TESTS = libsnark/gtests

GTEST_SRCS = \
src/algebra/curves/tests/test_bilinearity.cpp \
src/algebra/curves/tests/test_groups.cpp \
src/algebra/fields/tests/test_bigint.cpp \
src/algebra/fields/tests/test_fields.cpp \
src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp \
src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp \
src/relations/arithmetic_programs/qap/tests/test_qap.cpp \
src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp \
src/gtests.cpp
libsnark/algebra/curves/tests/test_bilinearity.cpp \
libsnark/algebra/curves/tests/test_groups.cpp \
libsnark/algebra/fields/tests/test_bigint.cpp \
libsnark/algebra/fields/tests/test_fields.cpp \
libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp \
libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp \
libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp \
libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp \
libsnark/gtests.cpp

DOCS = README.html

Expand Down Expand Up @@ -192,7 +192,7 @@ $(LIB_OBJS) $(if $(NO_GTEST),,$(GTEST_OBJS)) $(EXEC_OBJS): %.o: %.cpp

LIBGTEST_A = $(DEPINST)/lib/libgtest.a

$(LIBGTEST_A): $(GTESTDIR)/src/gtest-all.cc $(DEPINST_EXISTS)
$(LIBGTEST_A): $(GTESTDIR)/libsnark/gtest-all.cc $(DEPINST_EXISTS)
$(CXX) -o $(DEPINST)/lib/gtest-all.o -I $(GTESTDIR) -c -isystem $(GTESTDIR)/include $< $(CXXFLAGS)
$(AR) -rv $(LIBGTEST_A) $(DEPINST)/lib/gtest-all.o

Expand All @@ -205,13 +205,13 @@ $(LIBSNARK_A): $(LIB_OBJS) $(AR_LIBS)
libsnark.so: $(LIBSNARK_A) $(DEPINST_EXISTS)
$(CXX) -o $@ --shared -Wl,--whole-archive $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) -Wl,--no-whole-archive $(LDLIBS)

src/gadgetlib2/tests/gadgetlib2_test: \
src/gadgetlib2/tests/adapters_UTEST.cpp \
src/gadgetlib2/tests/constraint_UTEST.cpp \
src/gadgetlib2/tests/gadget_UTEST.cpp \
src/gadgetlib2/tests/integration_UTEST.cpp \
src/gadgetlib2/tests/protoboard_UTEST.cpp \
src/gadgetlib2/tests/variable_UTEST.cpp
libsnark/gadgetlib2/tests/gadgetlib2_test: \
libsnark/gadgetlib2/tests/adapters_UTEST.cpp \
libsnark/gadgetlib2/tests/constraint_UTEST.cpp \
libsnark/gadgetlib2/tests/gadget_UTEST.cpp \
libsnark/gadgetlib2/tests/integration_UTEST.cpp \
libsnark/gadgetlib2/tests/protoboard_UTEST.cpp \
libsnark/gadgetlib2/tests/variable_UTEST.cpp

$(EXECUTABLES): %: %.o $(LIBSNARK_A) $(DEPINST_EXISTS)
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
Expand Down Expand Up @@ -243,10 +243,10 @@ ifeq ($(PREFIX),)
install:
$(error Please provide PREFIX. E.g. make install PREFIX=/usr)
else
HEADERS_SRC=$(shell find src -name '*.hpp' -o -name '*.tcc')
HEADERS_DEST=$(patsubst src/%,$(PREFIX)/include/libsnark/%,$(HEADERS_SRC))
HEADERS_SRC=$(shell find libsnark -name '*.hpp' -o -name '*.tcc')
HEADERS_DEST=$(patsubst libsnark/%,$(PREFIX)/include/libsnark/%,$(HEADERS_SRC))

$(HEADERS_DEST): $(PREFIX)/include/libsnark/%: src/%
$(HEADERS_DEST): $(PREFIX)/include/libsnark/%: libsnark/%
mkdir -p $(shell dirname $@)
cp $< $@

Expand Down
0 ...algebra/curves/alt_bn128/alt_bn128_g1.cpp → ...algebra/curves/alt_bn128/alt_bn128_g1.cpp
View file
File renamed without changes.
0 ...algebra/curves/alt_bn128/alt_bn128_g1.hpp → ...algebra/curves/alt_bn128/alt_bn128_g1.hpp
View file
File renamed without changes.
0 ...algebra/curves/alt_bn128/alt_bn128_g2.cpp → ...algebra/curves/alt_bn128/alt_bn128_g2.cpp
View file
File renamed without changes.
0 ...algebra/curves/alt_bn128/alt_bn128_g2.hpp → ...algebra/curves/alt_bn128/alt_bn128_g2.hpp
View file
File renamed without changes.
0 ...gebra/curves/alt_bn128/alt_bn128_init.cpp → ...gebra/curves/alt_bn128/alt_bn128_init.cpp
View file
File renamed without changes.
0 ...gebra/curves/alt_bn128/alt_bn128_init.hpp → ...gebra/curves/alt_bn128/alt_bn128_init.hpp
View file
File renamed without changes.
0 ...ra/curves/alt_bn128/alt_bn128_pairing.cpp → ...ra/curves/alt_bn128/alt_bn128_pairing.cpp
View file
File renamed without changes.
0 ...ra/curves/alt_bn128/alt_bn128_pairing.hpp → ...ra/curves/alt_bn128/alt_bn128_pairing.hpp
View file
File renamed without changes.
0 ...algebra/curves/alt_bn128/alt_bn128_pp.cpp → ...algebra/curves/alt_bn128/alt_bn128_pp.cpp
View file
File renamed without changes.
0 ...algebra/curves/alt_bn128/alt_bn128_pp.hpp → ...algebra/curves/alt_bn128/alt_bn128_pp.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/curves/curve_utils.hpp → ...k/libsnark/algebra/curves/curve_utils.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/curves/curve_utils.tcc → ...k/libsnark/algebra/curves/curve_utils.tcc
View file
File renamed without changes.
0 ...nark/src/algebra/curves/public_params.hpp → ...libsnark/algebra/curves/public_params.hpp
View file
File renamed without changes.
0 ...algebra/curves/tests/test_bilinearity.cpp → ...algebra/curves/tests/test_bilinearity.cpp
View file
File renamed without changes.
0 .../src/algebra/curves/tests/test_groups.cpp → ...nark/algebra/curves/tests/test_groups.cpp
View file
File renamed without changes.
0 ...on_domain/domains/basic_radix2_domain.hpp → ...on_domain/domains/basic_radix2_domain.hpp
View file
File renamed without changes.
0 ...on_domain/domains/basic_radix2_domain.tcc → ...on_domain/domains/basic_radix2_domain.tcc
View file
File renamed without changes.
0 ...omain/domains/basic_radix2_domain_aux.hpp → ...omain/domains/basic_radix2_domain_aux.hpp
View file
File renamed without changes.
0 ...omain/domains/basic_radix2_domain_aux.tcc → ...omain/domains/basic_radix2_domain_aux.tcc
View file
File renamed without changes.
0 ...a/evaluation_domain/evaluation_domain.hpp → ...a/evaluation_domain/evaluation_domain.hpp
View file
File renamed without changes.
0 ...a/evaluation_domain/evaluation_domain.tcc → ...a/evaluation_domain/evaluation_domain.tcc
View file
File renamed without changes.
0 ...algebra/exponentiation/exponentiation.hpp → ...algebra/exponentiation/exponentiation.hpp
View file
File renamed without changes.
0 ...algebra/exponentiation/exponentiation.tcc → ...algebra/exponentiation/exponentiation.tcc
View file
File renamed without changes.
0 src/snark/src/algebra/fields/bigint.hpp → src/snark/libsnark/algebra/fields/bigint.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/fields/bigint.tcc → src/snark/libsnark/algebra/fields/bigint.tcc
View file
File renamed without changes.
0 src/snark/src/algebra/fields/field_utils.hpp → ...k/libsnark/algebra/fields/field_utils.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/fields/field_utils.tcc → ...k/libsnark/algebra/fields/field_utils.tcc
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp.hpp → src/snark/libsnark/algebra/fields/fp.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp.tcc → src/snark/libsnark/algebra/fields/fp.tcc
View file
File renamed without changes.
0 ...k/src/algebra/fields/fp12_2over3over2.hpp → ...snark/algebra/fields/fp12_2over3over2.hpp
View file
File renamed without changes.
0 ...k/src/algebra/fields/fp12_2over3over2.tcc → ...snark/algebra/fields/fp12_2over3over2.tcc
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp2.hpp → src/snark/libsnark/algebra/fields/fp2.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp2.tcc → src/snark/libsnark/algebra/fields/fp2.tcc
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp6_3over2.hpp → ...rk/libsnark/algebra/fields/fp6_3over2.hpp
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp6_3over2.tcc → ...rk/libsnark/algebra/fields/fp6_3over2.tcc
View file
File renamed without changes.
0 src/snark/src/algebra/fields/fp_aux.tcc → src/snark/libsnark/algebra/fields/fp_aux.tcc
View file
File renamed without changes.
0 .../src/algebra/fields/tests/test_bigint.cpp → ...nark/algebra/fields/tests/test_bigint.cpp
View file
File renamed without changes.
0 .../src/algebra/fields/tests/test_fields.cpp → ...nark/algebra/fields/tests/test_fields.cpp
View file
File renamed without changes.
0 ...ledge_commitment/knowledge_commitment.hpp → ...ledge_commitment/knowledge_commitment.hpp
View file
File renamed without changes.
0 ...ledge_commitment/knowledge_commitment.tcc → ...ledge_commitment/knowledge_commitment.tcc
View file
File renamed without changes.
0 ...bra/scalar_multiplication/kc_multiexp.hpp → ...bra/scalar_multiplication/kc_multiexp.hpp
View file
File renamed without changes.
0 ...bra/scalar_multiplication/kc_multiexp.tcc → ...bra/scalar_multiplication/kc_multiexp.tcc
View file
File renamed without changes.
0 ...lgebra/scalar_multiplication/multiexp.hpp → ...lgebra/scalar_multiplication/multiexp.hpp
View file
File renamed without changes.
0 ...lgebra/scalar_multiplication/multiexp.tcc → ...lgebra/scalar_multiplication/multiexp.tcc
View file
File renamed without changes.
0 ...rc/algebra/scalar_multiplication/wnaf.hpp → ...rk/algebra/scalar_multiplication/wnaf.hpp
View file
File renamed without changes.
0 ...rc/algebra/scalar_multiplication/wnaf.tcc → ...rk/algebra/scalar_multiplication/wnaf.tcc
View file
File renamed without changes.
0 src/snark/src/common/assert_except.hpp → src/snark/libsnark/common/assert_except.hpp
View file
File renamed without changes.
0 ...n/data_structures/accumulation_vector.hpp → ...n/data_structures/accumulation_vector.hpp
View file
File renamed without changes.
0 ...n/data_structures/accumulation_vector.tcc → ...n/data_structures/accumulation_vector.tcc
View file
File renamed without changes.
0 ...rc/common/data_structures/merkle_tree.hpp → ...rk/common/data_structures/merkle_tree.hpp
View file
File renamed without changes.
0 ...rc/common/data_structures/merkle_tree.tcc → ...rk/common/data_structures/merkle_tree.tcc
View file
File renamed without changes.
0 .../common/data_structures/sparse_vector.hpp → .../common/data_structures/sparse_vector.hpp
View file
File renamed without changes.
0 .../common/data_structures/sparse_vector.tcc → .../common/data_structures/sparse_vector.tcc
View file
File renamed without changes.
0 src/snark/src/common/default_types/ec_pp.hpp → ...k/libsnark/common/default_types/ec_pp.hpp
View file
File renamed without changes.
0 ...ommon/default_types/r1cs_ppzksnark_pp.hpp → ...ommon/default_types/r1cs_ppzksnark_pp.hpp
View file
File renamed without changes.
0 src/snark/src/common/profiling.cpp → src/snark/libsnark/common/profiling.cpp
View file
File renamed without changes.
0 src/snark/src/common/profiling.hpp → src/snark/libsnark/common/profiling.hpp
View file
File renamed without changes.
0 src/snark/src/common/serialization.hpp → src/snark/libsnark/common/serialization.hpp
View file
File renamed without changes.
0 src/snark/src/common/serialization.tcc → src/snark/libsnark/common/serialization.tcc
View file
File renamed without changes.
0 src/snark/src/common/template_utils.hpp → src/snark/libsnark/common/template_utils.hpp
View file
File renamed without changes.
0 src/snark/src/common/utils.cpp → src/snark/libsnark/common/utils.cpp
View file
File renamed without changes.
0 src/snark/src/common/utils.hpp → src/snark/libsnark/common/utils.hpp
View file
File renamed without changes.
0 src/snark/src/common/utils.tcc → src/snark/libsnark/common/utils.tcc
View file
File renamed without changes.
0 ...k/src/gadgetlib1/constraint_profiling.cpp → ...snark/gadgetlib1/constraint_profiling.cpp
View file
File renamed without changes.
0 ...k/src/gadgetlib1/constraint_profiling.hpp → ...snark/gadgetlib1/constraint_profiling.hpp
View file
File renamed without changes.
0 ...rc/gadgetlib1/examples/simple_example.hpp → ...rk/gadgetlib1/examples/simple_example.hpp
View file
File renamed without changes.
0 ...rc/gadgetlib1/examples/simple_example.tcc → ...rk/gadgetlib1/examples/simple_example.tcc
View file
File renamed without changes.
0 src/snark/src/gadgetlib1/gadget.hpp → src/snark/libsnark/gadgetlib1/gadget.hpp
View file
File renamed without changes.
0 src/snark/src/gadgetlib1/gadget.tcc → src/snark/libsnark/gadgetlib1/gadget.tcc
View file
File renamed without changes.
0 .../src/gadgetlib1/gadgets/basic_gadgets.hpp → ...nark/gadgetlib1/gadgets/basic_gadgets.hpp
View file
File renamed without changes.
0 .../src/gadgetlib1/gadgets/basic_gadgets.tcc → ...nark/gadgetlib1/gadgets/basic_gadgets.tcc
View file
File renamed without changes.
0 ...c/gadgetlib1/gadgets/gadget_from_r1cs.hpp → ...k/gadgetlib1/gadgets/gadget_from_r1cs.hpp
View file
File renamed without changes.
0 ...c/gadgetlib1/gadgets/gadget_from_r1cs.tcc → ...k/gadgetlib1/gadgets/gadget_from_r1cs.tcc
View file
File renamed without changes.
0 ...gadgets/hashes/digest_selector_gadget.hpp → ...gadgets/hashes/digest_selector_gadget.hpp
View file
File renamed without changes.
0 ...gadgets/hashes/digest_selector_gadget.tcc → ...gadgets/hashes/digest_selector_gadget.tcc
View file
File renamed without changes.
0 ...src/gadgetlib1/gadgets/hashes/hash_io.hpp → ...ark/gadgetlib1/gadgets/hashes/hash_io.hpp
View file
File renamed without changes.
0 ...src/gadgetlib1/gadgets/hashes/hash_io.tcc → ...ark/gadgetlib1/gadgets/hashes/hash_io.tcc
View file
File renamed without changes.
0 ...lib1/gadgets/hashes/sha256/sha256_aux.hpp → ...lib1/gadgets/hashes/sha256/sha256_aux.hpp
View file
File renamed without changes.
0 ...lib1/gadgets/hashes/sha256/sha256_aux.tcc → ...lib1/gadgets/hashes/sha256/sha256_aux.tcc
View file
File renamed without changes.
0 ...dgets/hashes/sha256/sha256_components.hpp → ...dgets/hashes/sha256/sha256_components.hpp
View file
File renamed without changes.
0 ...dgets/hashes/sha256/sha256_components.tcc → ...dgets/hashes/sha256/sha256_components.tcc
View file
File renamed without changes.
0 ...1/gadgets/hashes/sha256/sha256_gadget.hpp → ...1/gadgets/hashes/sha256/sha256_gadget.hpp
View file
File renamed without changes.
0 ...1/gadgets/hashes/sha256/sha256_gadget.tcc → ...1/gadgets/hashes/sha256/sha256_gadget.tcc
View file
File renamed without changes.
0 ...256/tests/generate_sha256_gadget_tests.py → ...256/tests/generate_sha256_gadget_tests.py
View file
File renamed without changes.
0 ...adgets/hashes/sha256/tests/pypy_sha256.py → ...adgets/hashes/sha256/tests/pypy_sha256.py
View file
File renamed without changes.
0 ...ashes/sha256/tests/test_sha256_gadget.cpp → ...ashes/sha256/tests/test_sha256_gadget.cpp
View file
File renamed without changes.
0 ...e/merkle_authentication_path_variable.hpp → ...e/merkle_authentication_path_variable.hpp
View file
File renamed without changes.
0 ...e/merkle_authentication_path_variable.tcc → ...e/merkle_authentication_path_variable.tcc
View file
File renamed without changes.
0 ...le_tree/merkle_tree_check_read_gadget.hpp → ...le_tree/merkle_tree_check_read_gadget.hpp
View file
File renamed without changes.
0 ...le_tree/merkle_tree_check_read_gadget.tcc → ...le_tree/merkle_tree_check_read_gadget.tcc
View file
File renamed without changes.
0 ..._tree/merkle_tree_check_update_gadget.hpp → ..._tree/merkle_tree_check_update_gadget.hpp
View file
File renamed without changes.
0 ..._tree/merkle_tree_check_update_gadget.tcc → ..._tree/merkle_tree_check_update_gadget.tcc
View file
File renamed without changes.
0 ...e_tree/tests/test_merkle_tree_gadgets.cpp → ...e_tree/tests/test_merkle_tree_gadgets.cpp
View file
File renamed without changes.
0 src/snark/src/gadgetlib1/pb_variable.hpp → ...snark/libsnark/gadgetlib1/pb_variable.hpp
View file
File renamed without changes.
0 src/snark/src/gadgetlib1/pb_variable.tcc → ...snark/libsnark/gadgetlib1/pb_variable.tcc
View file
File renamed without changes.
0 src/snark/src/gadgetlib1/protoboard.hpp → src/snark/libsnark/gadgetlib1/protoboard.hpp
View file
File renamed without changes.
0 src/snark/src/gadgetlib1/protoboard.tcc → src/snark/libsnark/gadgetlib1/protoboard.tcc
View file
File renamed without changes.
0 src/snark/src/gtests.cpp → src/snark/libsnark/gtests.cpp
View file
File renamed without changes.
0 ...rc/reductions/r1cs_to_qap/r1cs_to_qap.hpp → ...rk/reductions/r1cs_to_qap/r1cs_to_qap.hpp
View file
File renamed without changes.
0 ...rc/reductions/r1cs_to_qap/r1cs_to_qap.tcc → ...rk/reductions/r1cs_to_qap/r1cs_to_qap.tcc
View file
File renamed without changes.
0 ...relations/arithmetic_programs/qap/qap.hpp → ...relations/arithmetic_programs/qap/qap.hpp
View file
File renamed without changes.
0 ...relations/arithmetic_programs/qap/qap.tcc → ...relations/arithmetic_programs/qap/qap.tcc
View file
File renamed without changes.
0 ...rithmetic_programs/qap/tests/test_qap.cpp → ...rithmetic_programs/qap/tests/test_qap.cpp
View file
File renamed without changes.
0 ..._problems/r1cs/examples/r1cs_examples.hpp → ..._problems/r1cs/examples/r1cs_examples.hpp
View file
File renamed without changes.
0 ..._problems/r1cs/examples/r1cs_examples.tcc → ..._problems/r1cs/examples/r1cs_examples.tcc
View file
File renamed without changes.
0 ...raint_satisfaction_problems/r1cs/r1cs.hpp → ...raint_satisfaction_problems/r1cs/r1cs.hpp
View file
File renamed without changes.
0 ...raint_satisfaction_problems/r1cs/r1cs.tcc → ...raint_satisfaction_problems/r1cs/r1cs.tcc
View file
File renamed without changes.
0 src/snark/src/relations/variable.hpp → src/snark/libsnark/relations/variable.hpp
View file
File renamed without changes.
0 src/snark/src/relations/variable.tcc → src/snark/libsnark/relations/variable.tcc
View file
File renamed without changes.
0 ...ppzksnark/examples/run_r1cs_ppzksnark.hpp → ...ppzksnark/examples/run_r1cs_ppzksnark.hpp
View file
File renamed without changes.
0 ...ppzksnark/examples/run_r1cs_ppzksnark.tcc → ...ppzksnark/examples/run_r1cs_ppzksnark.tcc
View file
File renamed without changes.
0 ...nark/profiling/profile_r1cs_ppzksnark.cpp → ...nark/profiling/profile_r1cs_ppzksnark.cpp
View file
File renamed without changes.
0 ...zksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp → ...zksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp
View file
File renamed without changes.
0 ...zksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc → ...zksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc
View file
File renamed without changes.
0 .../r1cs_ppzksnark/r1cs_ppzksnark_params.hpp → .../r1cs_ppzksnark/r1cs_ppzksnark_params.hpp
View file
File renamed without changes.
0 ...s_ppzksnark/tests/test_r1cs_ppzksnark.cpp → ...s_ppzksnark/tests/test_r1cs_ppzksnark.cpp
View file
File renamed without changes.

0 comments on commit b2a114a

Please sign in to comment.