commit d26858f7035f67f7ffa4594fd60058c22429e28d
author Joey Armstrong <joey@opennetworking.org> Sat Jul 08 15:52:16 2023 -0400
committer Joey Armstrong <joey@opennetworking.org> Sat Jul 08 15:52:16 2023 -0400
tree b69440fe38adb71c70b748139a2f2c891ff6a6df
parent 42f4ce6a40535322b27f6a10cf94718452927066

Normalize MAKEDIR, ONF_MAKEDIR and ONF_MAKE

Change-Id: I3908c0738dbbed180d62dc0f4ba656226035ba5a

makefiles/bootstrap.mk

diff --git a/makefiles/bootstrap.mk b/makefiles/bootstrap.mk
index eec469b..d8264a1 100644
--- a/makefiles/bootstrap.mk
+++ b/makefiles/bootstrap.mk
@@ -16,25 +16,7 @@
 ##---]  LIBRARY MACROS  [---##
 ##--------------------------##
 is-null = $(if $(1),$(null),$(error $(1)= is undef))
-# is-null-var = $(if $($(1)),$(null),$(error $(1)= is undef))
-
-## [origin]
-## foreach: var=automatic, origin=undef
-is-null-var-orig = $(strip \
-  $(foreach varname,$(1),\
-      $(warning ** is-null-var: varname=$(varname), origin=$(origin 1), origin=$(origin var))\
-  )\
-)
-#  $(if $(1),$(call is-null-var-indirect,$($(1))),$(error $(1)= is undef)))\
-
-is-null-var-indirect = $(if $(1),$(null),$(error $(1)= is undef))
-
-# origin - undefned
-# default
-# environment
-# environment override
-# automatic
-# null(blah) ?   - true
+is-null-var = $(if $$(1),$(null),$(error $(1)= is undef))
 
 ## -----------------------------------------------------------------------
 ## Intent: Given an indirect var containing varname of a makefile *_ROOT
@@ -47,24 +29,15 @@
 ##   o OPT_MKDIR=$(OPT_ROOT)/makefiles
 ##   o If exists include $(OPT_MKDIR)/include.mk
 ## -----------------------------------------------------------------------
-# library-include   := $(call mk-library-include,blah)
-
 mk-library-include=$(strip \
-  $(warning mk-library-include: $$1[$(1)] = [$($(1))]))\
+  $(warning mk-library-include: $(1) = $($(1)))\
   $(call is-null-var,1)\
-  $(foreach var,$($(1)),\
+  $(foreach var,$$(1),\
     $(info var=$(var) is-null=$(call is-null-var,var))\
   $(foreach val,$$(var),\
-    $(info val=$(val))\
+    $(info val=$(val))\ 
     $(foreach makedir,$(subst _ROOT,_MKDIR,$(var)),\
 $(warning makedir=$(makedir))\
-)\
-)\
-)\
-)
-
-
-# $(warning makedir=$(makedir))\
       $(if $($(makedir)),$(null),\
         $(eval $(makedir)=$$$$($(var))/makefiles)\
 $(warning $(makedir) = $($($(makedir))))\
@@ -72,7 +45,6 @@
         $(foreach mf,$(wildcard $(wildcard $(val)/makefiles/include.mk)),\
 $(warning $$(eval include $(mf)))\
           $(eval include $(mf)))\
-))))\
 )
 
 $(if $(DEBUG-bootstrap_mk),$(warning LEAVE))