From 82c35ff83a5ac7bfdc9ae92aee32aeef8310ce2b Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Thu, 26 Feb 2015 19:44:33 -0800
Subject: [PATCH] Reorganize Makefile.am.

---
 Makefile.am | 66 ++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0ce4d0d4..b3abc448 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -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 \
@@ -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 \
@@ -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
@@ -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