makefiles/consts.mk
-------------------
o Define a non-verbose (no -t) xargs macro.
makefiles/include.mk
--------------------
o Define a path variable (local-mk-dir=) to access per-repo macros.
o Change global ONF_MAKEDIR= path to $(onf-mk-dir).
makefiles/lint/doc8/doc8.ini
makefiles/lint/doc8/doc8.mk
makefiles/lint/doc8/help.mk
makefiles/lint/doc8/include.mk
makefiles/lint/doc8/ini.mk
makefiles/lint/doc8/README.md
-----------------------------
o per-repository exclusions require using multiple --config doc8.ini.
o doc8 --config only accepts one flag.
o lint logic will merge configs into one.
o Added a conditional var to facilitate using --config doc8.ini.
makefiles/main/tempdir/
-----------------------
o Added logic to create and cleanup a tempdir for internal use.
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Change-Id: Ic1c54e982d6e24465bd38f02f60a3b700a7d9e33
diff --git a/makefiles/lint/doc8/ini.mk b/makefiles/lint/doc8/ini.mk
index 7a2393f..971bfb4 100644
--- a/makefiles/lint/doc8/ini.mk
+++ b/makefiles/lint/doc8/ini.mk
@@ -17,7 +17,9 @@
# SPDX-FileCopyrightText: 2023-2024 Open Networking Foundation Contributors
# SPDX-License-Identifier: Apache-2.0
# -----------------------------------------------------------------------
-# Intent:
+# Intent: doc8(s) --config switch will only accept one argument and
+# config(s)/exclusion(s) are needed from multiple sources.
+# This target will merge doc8.ini from onf-make/ and local/ for use.
# -----------------------------------------------------------------------
##-------------------##
@@ -32,18 +34,12 @@
lint-doc8-ini-tmp : $(lint-doc8-ini-tmp)
# -----------------------------------------------------------------------
-# Intent: Doc8(s) --config switch will only accept one argument and
-# configs/exclusions are needed from multiple sources.
-# This target will merge doc8.ini from onf-make/ and local/ for use.
+# doc8 config files to merge: lf/makefiles/{onf-make,local}/
# -----------------------------------------------------------------------
-# repo:onf-make is special, MAKEDIR=makefiles/local does not exist.
-# -----------------------------------------------------------------------
-lint-doc8-ini-raw := $(ONF_MAKEDIR)/lint/doc8/doc8.ini
-ifneq ($(--repo-name--),onf-make)
- lint-doc8-ini-raw += $(MAKEDIR)/lint/doc8/doc8.ini
-endif
+lint-doc8-ini-raw := $(onf-mk-dir)/lint/doc8/doc8.ini
+lint-doc8-ini-raw += $(local-mk-dir)/lint/doc8/doc8.ini
-lint-doc8-ini-src = $(wildcard $(lint-doc8-ini-raw))
+lint-doc8-ini-src = $(wildcard $(sort $(lint-doc8-ini-raw)))
$(lint-doc8-ini-tmp):
$(call banner,Target $@)