Rewrite Makefile to look the same as the one for RM48

[pes-rpp/rpp-simulink.git] / Makefile

diff --git a/Makefile b/Makefile
index 084d152e291b23f08f9ed56094aacbf64d6a2ca5..84541b62f24eacf91eba048f72ca6b2df79e9afc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,25 +3,29 @@ RELEASE_PREFIX = rpp-simulink
 include rpp/lib/common.mk
 
 release: $(RELEASE_BASENAME).zip
-       $(MAKE) -C rpp/lib release
        cp rpp/lib/rpp-lib-*.zip .
        $(MAKE) -C doc/test-sw release
        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
-       mkdir -p $@/rpp/lib/lwip/src
+# 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/TMS570LS313xFlashLnk.cmd $@/rpp/lib/rpp/TMS570LS313xFlashLnk.cmd
-       cp rpp/lib/rpp/TMS570LS3137.ccxml $@/rpp/lib/rpp/TMS570LS3137.ccxml
-       cp -r rpp/lib/os/7.0.2/include $@/rpp/lib/os/7.0.2/include
-       cp -r rpp/lib/lwip/src/include $@/rpp/lib/lwip/src/include
+# Copy library headers and linkes scripts
+       $(call cp_lib,rpp/TMS570LS313xFlashLnk.cmd)
+       $(call cp_lib,-r rpp/include)
+       $(call cp_lib,-r os/7.0.2/include)
+       $(call cp_lib,-r lwip/src/include)
+       cp --parents rpp/loadti/TMS570LS3137.ccxml $@/
+# Compile and include the PDF documentation
        $(MAKE) -C doc
        mkdir -p $@/doc
        cp doc/rpp_simulink.pdf $@/doc
 
 lib:
-       $(MAKE) -C rpp/lib/Release
+       $(MAKE) -C rpp/lib/Release # Compile the lib
+       $(MAKE) -C rpp/lib release # Create release zip and directory