]> rtime.felk.cvut.cz Git - pes-rpp/rpp-simulink.git/commitdiff
Fix Makefile to be platform independent
authorMichal Horn <hornmich@fel.cvut.cz>
Tue, 21 Apr 2015 08:42:02 +0000 (10:42 +0200)
committerMichal Horn <hornmich@fel.cvut.cz>
Tue, 21 Apr 2015 08:42:02 +0000 (10:42 +0200)
Makefile
doc/test-sw
rpp/lib

index 84541b62f24eacf91eba048f72ca6b2df79e9afc..9edf12b22a220afebb39c518cfedbd1075430cd3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 RELEASE_PREFIX = rpp-simulink
 
+include rpp/lib/Makefile.var
 include rpp/lib/common.mk
 
 release: $(RELEASE_BASENAME).zip
@@ -16,11 +17,11 @@ $(RELEASE_BASENAME):: lib
        mkdir -p $@/rpp/lib
        cp --parents rpp/lib/rpp-lib.lib $@/
 # Copy library headers and linkes scripts
-       $(call cp_lib,rpp/TMS570LS313xFlashLnk.cmd)
+       $(call cp_lib,rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT))
        $(call cp_lib,-r rpp/include)
-       $(call cp_lib,-r os/7.0.2/include)
+       $(call cp_lib,-r os/$(rpp_lib_OS)/include)
        $(call cp_lib,-r lwip/src/include)
-       cp --parents rpp/loadti/TMS570LS3137.ccxml $@/
+       cp --parents rpp/loadti/$(rpp_lib_$(TARGET)_TARGET_CFG) $@/
 # Compile and include the PDF documentation
        $(MAKE) -C doc
        mkdir -p $@/doc
index ceb024f41dd73a21f7305563a208d6f5b37ab9ec..70bc8012765f545b97c121f43770d9fb9e59d16d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ceb024f41dd73a21f7305563a208d6f5b37ab9ec
+Subproject commit 70bc8012765f545b97c121f43770d9fb9e59d16d
diff --git a/rpp/lib b/rpp/lib
index 8c4b1e5b6874e89807a7d5061c6646c77c38933e..8a3aa319332aa8f9f73d8d7a540d8dfbf6210fa4 160000 (submodule)
--- a/rpp/lib
+++ b/rpp/lib
@@ -1 +1 @@
-Subproject commit 8c4b1e5b6874e89807a7d5061c6646c77c38933e
+Subproject commit 8a3aa319332aa8f9f73d8d7a540d8dfbf6210fa4