Include Omni Core via seperate Makefiles

Provides greater seperation and clarity.

src/Makefile.am

@@ -152,56 +152,11 @@ JSON_H = \
   json/json_spirit_writer.h \
   json/json_spirit_writer_template.h
 
-# Omni Core extensions
-OMNICORE_H = \
-  mastercore.h \
-  mastercore_convert.h \
-  mastercore_dex.h \
-  mastercore_errors.h \
-  mastercore_log.h \
-  mastercore_mdex.h \
-  mastercore_parse_string.h \
-  mastercore_persistence.h \
-  mastercore_rpc.h \
-  mastercore_script.h \
-  mastercore_sp.h \
-  mastercore_tx.h \
-  mastercore_version.h \
-  omnicore_encoding.h \
-  omnicore_createpayload.h \
-  omnicore_rpctx.h \
-  omnicore_utils.h \
-  omnicore_pending.h
-
-OMNICORE_CPP = \
-  mastercore.cpp \
-  mastercore_convert.cpp \
-  mastercore_dex.cpp \
-  mastercore_log.cpp \
-  mastercore_mdex.cpp \
-  mastercore_parse_string.cpp \
-  mastercore_persistence.cpp \
-  mastercore_rpc.cpp \
-  mastercore_script.cpp \
-  mastercore_sp.cpp \
-  mastercore_tx.cpp \
-  mastercore_version.cpp \
-  omnicore_encoding.cpp \
-  omnicore_createpayload.cpp \
-  omnicore_rpctx.cpp \
-  omnicore_utils.cpp \
-  omnicore_pending.cpp
-
-BITCOIN_CORE_H += \
-  $(OMNICORE_H)
-#
-
 obj/build.h: FORCE
 	@$(MKDIR_P) $(builddir)/obj
 	@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
 	  $(abs_top_srcdir)
 libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
-libbitcoin_common_a-mastercore_version.$(OBJEXT): obj/build.h # Omni Core
 
 # server: shared between bitcoind and bitcoin-qt
 libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS)
@@ -301,9 +256,9 @@ libbitcoin_common_a_SOURCES = \
   script/script_error.cpp \
   $(BITCOIN_CORE_H)
 
-# Omni Core extensions
-libbitcoin_common_a_SOURCES += \
-  $(OMNICORE_CPP)
+# Omni Core
+include Makefile.omnicore.include
+#
 
 # util: shared between all executables.
 # This library *must* be included to make sure that the glibc

src/Makefile.omnicore.include

@@ -0,0 +1,44 @@
+OMNICORE_H = \
+  mastercore.h \
+  mastercore_convert.h \
+  mastercore_dex.h \
+  mastercore_errors.h \
+  mastercore_log.h \
+  mastercore_mdex.h \
+  mastercore_parse_string.h \
+  mastercore_persistence.h \
+  mastercore_rpc.h \
+  mastercore_script.h \
+  mastercore_sp.h \
+  mastercore_tx.h \
+  mastercore_version.h \
+  omnicore_encoding.h \
+  omnicore_createpayload.h \
+  omnicore_pending.h \
+  omnicore_rpctx.h \
+  omnicore_utils.h
+
+OMNICORE_CPP = \
+  mastercore.cpp \
+  mastercore_convert.cpp \
+  mastercore_dex.cpp \
+  mastercore_log.cpp \
+  mastercore_mdex.cpp \
+  mastercore_parse_string.cpp \
+  mastercore_persistence.cpp \
+  mastercore_rpc.cpp \
+  mastercore_script.cpp \
+  mastercore_sp.cpp \
+  mastercore_tx.cpp \
+  mastercore_version.cpp \
+  omnicore_encoding.cpp \
+  omnicore_createpayload.cpp \
+  omnicore_pending.cpp \
+  omnicore_rpctx.cpp \
+  omnicore_utils.cpp
+
+libbitcoin_server_a_SOURCES += \
+  $(OMNICORE_CPP) \
+  $(OMNICORE_H)
+
+libbitcoin_server_a-mastercore_version.$(OBJEXT): obj/build.h # build info

src/Makefile.omnitest.include

@@ -0,0 +1,16 @@
+OMNICORE_TEST_H =
+
+OMNICORE_TEST_CPP = \
+  test/mastercore_create_payload_tests.cpp \
+  test/mastercore_encoding_c_tests.cpp \
+  test/mastercore_obfuscation_tests.cpp \
+  test/mastercore_rounduint64_tests.cpp \
+  test/mastercore_script_dust_tests.cpp \
+  test/mastercore_script_extraction_tests.cpp \
+  test/mastercore_script_solver_tests.cpp \
+  test/mastercore_strtoint64_tests.cpp \
+  test/mastercore_swapbyteorder_tests.cpp
+
+BITCOIN_TESTS += \
+  $(OMNICORE_TEST_CPP) \
+  $(OMNICORE_TEST_H)

src/Makefile.test.include

@@ -80,20 +80,8 @@ BITCOIN_TESTS += \
   test/rpc_wallet_tests.cpp
 endif
 
-# Omni Core extensions
-OMNICORE_TESTS = \
-  test/mastercore_create_payload_tests.cpp \
-  test/mastercore_encoding_c_tests.cpp \
-  test/mastercore_obfuscation_tests.cpp \
-  test/mastercore_rounduint64_tests.cpp \
-  test/mastercore_script_dust_tests.cpp \
-  test/mastercore_script_extraction_tests.cpp \
-  test/mastercore_script_solver_tests.cpp \
-  test/mastercore_strtoint64_tests.cpp \
-  test/mastercore_swapbyteorder_tests.cpp
-
-BITCOIN_TESTS += \
-  $(OMNICORE_TESTS)
+# Omni Core tests
+include Makefile.omnitest.include
 #
 
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)