From: Konrad Bańka <k.banka@samsung.com>
Date: Wed, 28 Apr 2021 14:15:26 +0000 (+0200)
Subject: [vFW_CNF_CDS] Correct Makefile target
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=1a8e3c3133f0b6c355689875abd57c481f3a1e81

[vFW_CNF_CDS] Correct Makefile target

package target was pointing at directory thus Make in some cases didn't
launch this target as dependency due to related file (package/) present.
Fixed it by marking it Phony.

Issue-ID: INT-1899
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Iddd6ba466d5ffd4c73a069b4914136ab00cff048
---

diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index 3f0a39a6..f81585fa 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all clean helm base cba clean_all
+.PHONY: all clean helm base cba clean_all package
 DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
 NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo
 CBA_NAME ?= CBA
@@ -8,7 +8,7 @@ clean_all:
 	$(MAKE) all
 
 #Can't use .csar extension or SDC will panic
-all: package/ helm base cba
+all: package helm base cba
 	cd package_dummy/ && zip -r $(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
 	cd package_native/ && zip -r $(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
 	mv package_dummy/$(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
@@ -16,16 +16,16 @@ all: package/ helm base cba
 	cp $(DUMMY_ONBOARDING_PACKAGE_NAME).zip ../automation/vsp/
 	cp $(NATIVE_ONBOARDING_PACKAGE_NAME).zip  ../automation/vsp/
 
-helm: package/
+helm: package
 	make -C helm
 	mv helm/helm_*.tgz package_native/
 	mv helm/*.tgz package_dummy/
 
-base: package/
+base: package
 	cp base_dummy/* package_dummy/
 	cp base_native/* package_native/
 
-cba: package/
+cba: package
 	cp -r cba cba_dummy
 	sed -i 's/"helm_/"/g' cba_dummy/Definitions/vFW_CNF_CDS.json
 	cd cba_dummy/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\*
@@ -33,7 +33,7 @@ cba: package/
 	mv cba/$(CBA_NAME).zip package_native/
 	mv cba_dummy/$(CBA_NAME).zip package_dummy/
 
-package/:
+package:
 	mkdir package_dummy/
 	mkdir package_native/