[PATCH v2 07/10] bringup: clean up the nfs-related make targets

[Scott Mayhew <smayhew@redhat.com>]

Clean up the top level Makefile and scripts/brinup.Makefile by moving
the following into the lower level Makefiles for the nfs-related make
targets (ktls, nfsd, and siw):

1. The "ifeq (y,$(CONFIG_KDEVOPS_SETUP_foo))" directives.
2. The updates of the KDEVOPS_BRING_UP_DEPS/KDEVOPS_BRING_UP_DESTROY
   variables.

There should be no change in behavior.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 Makefile                 |  8 --------
 scripts/bringup.Makefile | 13 -------------
 scripts/ktls.Makefile    |  7 +++++++
 scripts/nfsd.Makefile    |  8 ++++++++
 scripts/siw.Makefile     |  6 ++++++
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index e0cb89c5..11b409e0 100644
--- a/Makefile
+++ b/Makefile
@@ -104,17 +104,9 @@ ifeq (y,$(CONFIG_WORKFLOWS))
 include workflows/Makefile
 endif # CONFIG_WORKFLOWS
 
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW))
 include scripts/siw.Makefile
-endif # CONFIG_KDEVOPS_SETUP_SIW
-
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS))
 include scripts/ktls.Makefile
-endif # CONFIG_KDEVOPS_SETUP_KTLS
-
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_NFSD))
 include scripts/nfsd.Makefile
-endif # CONFIG_KDEVOPS_SETUP_NFSD
 
 include scripts/devconfig.Makefile
 include scripts/ssh.Makefile
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 55e7d8d1..148547c0 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -20,19 +20,6 @@ endif
 
 endif
 
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_NFSD))
-KDEVOPS_BRING_UP_DEPS += nfsd
-endif # KDEVOPS_SETUP_NFSD
-
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS))
-KDEVOPS_BRING_UP_DEPS += ktls
-KDEVOPS_DESTROY_DEPS += ktls-destroy
-endif # KDEVOPS_SETUP_KTLS
-
-ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW))
-KDEVOPS_BRING_UP_DEPS += siw
-endif # KDEVOPS_SETUP_SIW
-
 bringup: $(KDEVOPS_BRING_UP_DEPS)
 
 destroy: $(KDEVOPS_DESTROY_DEPS)
diff --git a/scripts/ktls.Makefile b/scripts/ktls.Makefile
index 97753804..905f6887 100644
--- a/scripts/ktls.Makefile
+++ b/scripts/ktls.Makefile
@@ -1,3 +1,5 @@
+ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS))
+
 ktls:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
 		-f 30 -i hosts playbooks/ktls.yml
@@ -5,4 +7,9 @@ ktls:
 ktls-destroy:
 	$(Q)rm -rf $(TOPDIR)/ca
 
+KDEVOPS_BRING_UP_DEPS += ktls
+KDEVOPS_DESTROY_DEPS += ktls-destroy
+
 PHONY += ktls ktls-destroy
+
+endif
diff --git a/scripts/nfsd.Makefile b/scripts/nfsd.Makefile
index a337390c..f534f4ff 100644
--- a/scripts/nfsd.Makefile
+++ b/scripts/nfsd.Makefile
@@ -1,3 +1,5 @@
+ifeq (y,$(CONFIG_KDEVOPS_SETUP_NFSD))
+
 NFSD_EXTRA_ARGS += nfsd_export_device_prefix='$(subst ",,$(CONFIG_NFSD_EXPORT_DEVICE_PREFIX))'
 NFSD_EXTRA_ARGS += nfsd_export_device_count='$(subst ",,$(CONFIG_NFSD_EXPORT_DEVICE_COUNT))'
 NFSD_EXTRA_ARGS += nfsd_export_fstype='$(subst ",,$(CONFIG_NFSD_EXPORT_FSTYPE))'
@@ -17,3 +19,9 @@ ANSIBLE_EXTRA_ARGS += $(NFSD_EXTRA_ARGS)
 nfsd:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
 		-f 30 -i hosts -l nfsd playbooks/nfsd.yml
+
+KDEVOPS_BRING_UP_DEPS += nfsd
+
+PHONY += nfsd
+
+endif
diff --git a/scripts/siw.Makefile b/scripts/siw.Makefile
index 80f96309..d09d1a2f 100644
--- a/scripts/siw.Makefile
+++ b/scripts/siw.Makefile
@@ -1,5 +1,11 @@
+ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW))
+
 siw:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
 		-f 30 -i hosts playbooks/siw.yml
 
+KDEVOPS_BRING_UP_DEPS += siw
+
 PHONY += siw
+
+endif
-- 
2.43.0