VOL-5358 - Build & test on the new AMI image
lf/bridge.mk
lf/transition.mk
----------------
o Replace bridge.mk with transition.mk copied from lf/onf-make/transition.mk.
o Some minor varname changes were needed.
Makefile
--------
o Update logic and conditionals to begin using transition logic.
o Change use-lib-makefiles conditional to depend on an env var
in addition to hardcoded usernames.
o Cleanup includes and lint conditional flags, most live in config.mk now.
lf/config.mk
------------
o Update conditiona makefile lint and behavior flags to include
all definitions currently supported by repo:onf-make.
makefiles/include.mk
--------------------
o Begin removing makefile includes replaced by repo:onf-make.
o virtualenv.mk, etc/include, consts.mk, etc.
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Change-Id: Ic53841883b125423a3685fdd09e73aaa86556b79
diff --git a/Makefile b/Makefile
index ac4d19e..fa6ca53 100755
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,28 @@
# limitations under the License.
# -----------------------------------------------------------------------
+$(if $(DEBUG),$(warning ENTER))
+
.PHONY: test
-.DEFAULT_GOAL := test
+.DEFAULT_GOAL := test
+MAKECMDGOALS ?= test
##-------------------##
##---] GLOBALS [---##
##-------------------##
-TOP ?= .
-MAKEDIR ?= $(TOP)/makefiles
+$(if $(findstring joey,$(USER)),\
+ $(eval USE_LF_MK := 1)) # special snowflake
-$(if $(VERBOSE),$(eval export VERBOSE=$(VERBOSE))) # visible to include(s)
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+ifdef USE_LF_MK
+ include lf/include.mk
+else
+ include lf/transition.mk
+ include $(legacy-mk)/include.mk
+endif # ifdef USE_LF_MK
+
##--------------------------
## Enable setup.py debugging
@@ -33,18 +45,6 @@
# export DISTUTILS_DEBUG := 1 # verbose: pip
export DOCKER_DEBUG := 1 # verbose: docker
-# Makefile for voltha-protos
-default: test
-
-## Library linting
-# NO-LINT-MAKEFILE := true # cleanup needed
-NO-LINT-SHELL := true # cleanup needed
-
-##--------------------##
-##---] INCLUDES [---##
-##--------------------##
-include $(MAKEDIR)/include.mk
-
# Function to extract the last path component from go_package line in .proto files
define go_package_path
$(shell grep go_package $(1) | sed -n 's/.*\/\(.*\)";/\1/p')