Cleanup Makefile for demos

diff --git a/rpp/demos/Makefile b/rpp/demos/Makefile
index e94ce25aa0ea33bbe7bb87ffc029ba72ac1735c1..ec16b9c6882717e3d7cae915d51a27e0e70c4808 100644 (file)
--- a/rpp/demos/Makefile
+++ b/rpp/demos/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Czech Technical University in Prague
+# Copyright (C) 2013, 2015 Czech Technical University in Prague
 #
 # Authors:
 #     - Michal Sojka <sojkam1@fel.cvut.cz>
@@ -12,22 +12,34 @@
 # Abstract:
 #     Build demos
 
-include Makefile.var
+include ../lib/Makefile.config
 
-MODELS=$(wildcard *.slx)
-BUILD_DIRS=$(MODELS:%.slx=%_rpp)
+DEMOS = $(demos_$(TARGET))
+
+demos_rm48_hdk = $(demos_hdk)
+demos_tms570_hdk = $(demos_hdk)
 
-all: lib set-target
-       matlab -nojvm -r "try; rpp_build_demos(); catch ME, disp(getReport(ME)); exit(1); end; exit(0)"
+demos_hdk =                            \
+       adc_demo_hdk                    \
+       can_ext_mode_demo               \
+       can_simple_demo                 \
+       cantransmit                             \
+       continuous_hdk                  \
+       demo_board_hdk                  \
+       echo_char                               \
+       gio_demo_hdk                    \
+       hello_world                             \
+       multirate_st_hdk
 
-%_rpp: %.slx lib
-       matlab -nojvm -r "try; rpp_build_demos($<); catch ME, disp(getReport(ME)); exit(1); end; exit(0)"
+comma=,
+DEMOS_ARG=$(patsubst %$(comma),%,)
+all: lib
+       matlab -nojvm -r "try; rpp_build_demos $(DEMOS); catch ME, disp(getReport(ME)); exit(1); end; exit(0)"
 
 lib:
        $(MAKE) -C ../lib rpp-lib.lib
-       
-set-target:
-       matlab -nojvm -r "try; rpp_demos_set_tg($(rpp_target_file), $(rpp_demo_set)); catch ME, disp(getReport(ME)); exit(1); end; exit(0)"
-       
+
+MODELS=$(wildcard *.slx)
+BUILD_DIRS=$(MODELS:%.slx=%_rpp)
 clean:
        rm -rf $(BUILD_DIRS)

diff --git a/rpp/demos/Makefile.var b/rpp/demos/Makefile.var
deleted file mode 100644 (file)
index 923f9af..0000000
--- a/rpp/demos/Makefile.var
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2013 Czech Technical University in Prague
-#
-# Authors:
-#     - Michal Horn <hornmich@fel.cvut.cz>
-#
-# This document contains proprietary information belonging to Czech
-# Technical University in Prague. Passing on and copying of this
-# document, and communication of its contents is not permitted
-# without prior written authorization.
-#
-# File : Makefile.var
-# Abstract:
-#     Variables defining sets of demos for targets
-
-include ../lib/Makefile.var
-
-rpp_demo_set = $(rpp_$(TARGET)_demos)
-
-rpp_target_file = $(rpp_$(TARGET)_target_file)
-
-rpp_rm48_hdk_demos =           \
-       'adc_demo_hdk',                 \
-       'can_ext_mode_demo',    \
-       'can_simple_demo',              \
-       'cantransmit',                  \
-       'continuous_hdk',               \
-       'demo_board_hdk',               \
-       'echo_char',                    \
-       'gio_demo_hdk',                 \
-       'hello_world',                  \
-       'multirate_st_hdk'
-       
-rpp_rm48_hdk_target_file = 'rpp.tlc'
-
-rpp_tms570_hdk_demos =                 \
-       'adc_demo_hdk',                 \
-       'can_ext_mode_demo',    \
-       'can_simple_demo',              \
-       'cantransmit',                  \
-       'continuous_hdk',               \
-       'demo_board_hdk',               \
-       'echo_char',                    \
-       'gio_demo_hdk',                 \
-       'hello_world',                  \
-       'multirate_st_hdk'
-
-rpp_tms570_hdk_target_file = 'rpp.tlc'