Fix multiversion builds
This includes:
* Revert switch to onf-make: onf-make was never compatible with
this repo. For now, we want to revert these changes so that the
build can work properly again.
* Re-enable static builds: the latest updates don't require removing
patching from voltha-system-tests or cord-tester to work. The build
also succeeds if patching is removed, so that is a likely future
change to those repos.
* Switch to an updated custom version of sphinx-multiversion: though
originally forked from zdw for the purpose of making changes to the
prep step or other functionality, none was necessary. However, the
latest changes to the mainline sphinx-multiversion have now been
brought into the fork, with zdw's prep additions included.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I0afb08030edcae4d2e968c63ef5eb11e17085d8a
diff --git a/makefiles/include.mk b/makefiles/include.mk
index 4360b73..44872b4 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -60,7 +60,7 @@
## 1) Library constants and logic loaded first
## 2) Parameterize and augment targets from local (repo specific)
## -----------------------------------------------------------------------
-include $(lf-sbx-root)/lf/config.mk # include $(onf-mk-top)/makefiles/config.mk
+include $(onf-mk-top)/makefiles/config.mk
include $(onf-mk-lib)/include.mk
include $(onf-mk-loc)/include.mk