Skip to content

Reorganize Makefile.am. #2

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

Merged
merged 1 commit into from
Feb 27, 2015
Merged

Reorganize Makefile.am. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 30 additions & 36 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,11 @@ pkgconfig_DATA = libbitcoin-consensus.pc
#
ACLOCAL_AMFLAGS = -I m4

#
# headers
#
bitcoin_includedir = ${includedir}/bitcoin

bitcoin_include_HEADERS = \
include/bitcoin/consensus.hpp

bitcoin_consensus_includedir = ${includedir}/bitcoin/consensus
bitcoin_consensus_include_HEADERS = \
include/bitcoin/consensus/define.hpp \
include/bitcoin/consensus/export.hpp \
include/bitcoin/consensus/version.hpp

#
# libraries
#
lib_LTLIBRARIES = src/libbitcoin-consensus.la
lib_LTLIBRARIES = \
src/libbitcoin-consensus.la

src_libbitcoin_consensus_la_CPPFLAGS = \
-I${srcdir}/include \
Expand All @@ -39,12 +26,29 @@ src_libbitcoin_consensus_la_CPPFLAGS = \
if WITH_SECP256K1
src_libbitcoin_consensus_la_CPPFLAGS += \
${secp256k1_CFLAGS}

src_libbitcoin_consensus_la_LIBADD = \
${secp256k1_LIBS}
else
src_libbitcoin_consensus_la_CPPFLAGS += \
${ssl_CFLAGS} \
${crypto_CFLAGS}

src_libbitcoin_consensus_la_LIBADD = \
${ssl_LIBS} \
${crypto_LIBS}
endif

bitcoin_includedir = ${includedir}/bitcoin
bitcoin_include_HEADERS = \
include/bitcoin/consensus.hpp

bitcoin_consensus_includedir = ${includedir}/bitcoin/consensus
bitcoin_consensus_include_HEADERS = \
include/bitcoin/consensus/define.hpp \
include/bitcoin/consensus/export.hpp \
include/bitcoin/consensus/version.hpp

src_libbitcoin_consensus_la_SOURCES = \
src/consensus/consensus.cpp \
src/crypto/hmac_sha512.cpp \
Expand All @@ -67,23 +71,16 @@ src_libbitcoin_consensus_la_SOURCES += \
src/ecwrapper.cpp
endif

if WITH_SECP256K1
src_libbitcoin_consensus_la_LIBADD = \
${secp256k1_LIBS}
else
src_libbitcoin_consensus_la_LIBADD = \
${ssl_LIBS} \
${crypto_LIBS}
endif

#
# tests
#
if WITH_TESTS

TESTS = test/libbitcoin_consensus_test
TESTS = \
test/libbitcoin_consensus_test

check_PROGRAMS = test/libbitcoin_consensus_test
check_PROGRAMS = \
test/libbitcoin_consensus_test

test_libbitcoin_consensus_test_CPPFLAGS = \
-I${srcdir}/include \
Expand All @@ -99,15 +96,6 @@ test_libbitcoin_consensus_test_CPPFLAGS += \
${crypto_CFLAGS}
endif

test_libbitcoin_consensus_test_SOURCES = \
test/main.cpp \
test/consensus__script_verify.cpp \
test/consensus__verify_flags_to_script_flags.cpp \
test/consensus__script_error_to_verify_result.cpp

#TODO:
#test/script.cpp

test_libbitcoin_consensus_test_LDADD = \
src/libbitcoin-consensus.la \
-lboost_unit_test_framework
Expand All @@ -119,6 +107,12 @@ else
test_libbitcoin_consensus_test_LDADD += \
${ssl_LIBS} \
${crypto_LIBS}
endif
endif

test_libbitcoin_consensus_test_SOURCES = \
test/main.cpp \
test/consensus__script_verify.cpp \
test/consensus__verify_flags_to_script_flags.cpp \
test/consensus__script_error_to_verify_result.cpp

endif