Add call to TASTECV in the generated Makefile

templates/skeletons/makefile.tmplt

@@ -99,16 +99,18 @@ build-default:	aadl2glueC build/system_config.h ${DATAVIEW_PATH}/built build/dep
 run: # Space creator will always build before, so no need to depend on build-default
 	$(MAKE) -j -C build -f Makefile.taste run
 
+# Run the Concurrency View analysis tool (cheddar/marzhin)
+run_cv: build/ConcurrencyView.aadl
+	TASTECV --load $^
+
+# The Concurrency View needed by Cheddar is the concatenation of system.aadl and ocarina_components.aadl
+build/ConcurrencyView.aadl:	build/system.aadl
+	cat $^ $(shell taste-config --prefix)/share/ocarina/AADLv2/ocarina_components.aadl > $@
+
 # Rule to invoke Ocarina (generation of POHI middleware code)
-build/deploymentview_final/Makefile:	build/main.aadl ${DATAVIEW_AADLV2} ../ConcurrencyView_Properties.aadl
+build/deploymentview_final/Makefile:	build/main.aadl ${DATAVIEW_AADLV2}
 	cd build ; ocarina -x main.aadl
 
-@@-- ConcurrencyView_Properties is normally always present (even if empty) as
-@@-- it is generated by the GUIs... Just in case it is not there, create it.
-# Optionally hold thread priorities, offset, stack size. Create if not present
-../ConcurrencyView_Properties.aadl:
-	touch $@
-
 @@-- SQL Database: can be created by taste-create-database
 @@-- Add a dependency to make sure that if is is modified, the GUIs
 @@-- Using it are properly updated
@@ -258,4 +260,4 @@ clean:
 	rm -rf binaries dataview
 	$(MAKE) -C build -f Makefile.taste clean
 
-.PHONY: clean simu compile-all-linux function-instances-linux function-types-linux build-default dataview build-rtems-ada dataview
+.PHONY: clean simu compile-all-linux function-instances-linux function-types-linux build-default dataview build-rtems-ada dataview run_cv