Merge branch 'maint-rm48' into rm48/master

Conflicts:
	Makefile
	rpp/blocks/rpp_lib.slx
	rpp/lib

diff --cc Makefile
index ba5ee7e074cacea0457d3c254df784a80d0b94a5,eaa8a0856330b25d24ab2e878238949c3cec743d..ed82339b2237969b3ae3bcc3bd324fe34d01214e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -9,14 -8,20 +8,20 @@@ release: $(RELEASE_BASENAME).zi
        cp doc/test-sw/rpp-test-*.zip .
        cp doc/rpp_simulink.pdf rpp_simulink-$(RELEASE_VERSION).pdf
  
+ cp_lib = cd rpp/lib/$(LIB_RELEASE_BASENAME) && cp --parents $(1) ../../../$(@)/rpp/lib/
+ 
+ $(RELEASE_BASENAME):: LIB_RELEASE_BASENAME:=$(shell make -C rpp/lib --silent print-release-basename)
  $(RELEASE_BASENAME):: lib
-       mkdir -p $@/rpp/lib/rpp
-       mkdir -p $@/rpp/lib/os/7.0.2_rm48
+ # Copy compiled library
+       mkdir -p $@/rpp/lib
        cp --parents rpp/lib/rpp-lib.lib $@/
-       cp -r rpp/lib/rpp/include $@/rpp/lib/rpp/include
-       cp rpp/lib/rpp/RM48L952FlashLnk.cmd $@/rpp/lib/rpp/RM48L952FlashLnk.cmd
-       cp rpp/loadti/RM48L952.ccxml $@/rpp/loadti/RM48L952.ccxml
-       cp -r rpp/lib/os/7.0.2_rm48/include $@/rpp/lib/os/7.0.2_rm48/include
+ # Copy library headers and linkes scripts
 -      $(call cp_lib,rpp/TMS570LS313xFlashLnk.cmd)
 -      $(call cp_lib,rpp/TMS570LS3137.ccxml)
++      $(call cp_lib,rpp/RM48L952FlashLnk.cmd)
++      $(call cp_lib,rpp/RM48L952.ccxml)
+       $(call cp_lib,-r rpp/include)
 -      $(call cp_lib,-r os/7.0.2_tms570/include)
++      $(call cp_lib,-r os/7.0.2_rm48/include)
+       $(call cp_lib,-r lwip/src/include)
+ # Compile and include the PDF documentation
        $(MAKE) -C doc
        mkdir -p $@/doc
        cp doc/rpp_simulink.pdf $@/doc

diff --cc rpp/blocks/rpp_lib.slx
index e20e0784390fb319c9e4384e6a925ced43483951,9b99d9d65fe2d917a794d641ad8590bc893ae636..6ff7bc128ff05ea5fead0066676e9d0864028026
Binary files differ

diff --cc rpp/lib
index a1162fdb1d1f4450a8d6d15e9faab1c826c79abd,dc9ab0f4439a251dec4c69d7b58d08c82b39de65..87e73677fdeec0e6434a7f86b8533935f002877b
--- 1/rpp/lib
--- 2/rpp/lib
+++ b/rpp/lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a1162fdb1d1f4450a8d6d15e9faab1c826c79abd
 -Subproject commit dc9ab0f4439a251dec4c69d7b58d08c82b39de65
++Subproject commit 87e73677fdeec0e6434a7f86b8533935f002877b