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

index 74d4502f032d6c4075861ea550968cd013166165..fb8bfcfcfb673d9b7b0c5011709aacf2218ea869 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@
 # See http://processors.wiki.ti.com/index.php/Projects_-_Command_Line_Build/Create
 # and https://bugs.eclipse.org/bugs/show_bug.cgi?id=186847
 
+include rpp-lib/Makefile.var
+
 all: rpp-test-sw
        $(call rmdir,$(TMP_WORKSPACE))
 
@@ -48,14 +50,14 @@ release: $(RELEASE_BASENAME).zip
 
 $(RELEASE_BASENAME):: lib
        mkdir -p $@/rpp-lib/rpp/
-       mkdir -p $@/rpp-lib/os/7.0.2
+       mkdir -p $@/rpp-lib/os/$(rpp_lib_OS)
        mkdir -p $@/rpp-lib/lwip/src
 
        cp --parents rpp-lib/rpp-lib.lib rpp-lib/common.mk $@/
        cp --parents rpp-lib/.ccsproject rpp-lib/.cproject rpp-lib/.project $@/
        cp -r rpp-lib/rpp/include $@/rpp-lib/rpp/include
-       cp rpp-lib/rpp/TMS570LS313xFlashLnk.cmd $@/rpp-lib/rpp/TMS570LS313xFlashLnk.cmd
-       cp -r rpp-lib/os/7.0.2/include $@/rpp-lib/os/7.0.2/include
+       cp rpp-lib/rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT) $@/rpp-lib/rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT)
+       cp -r rpp-lib/os/$(rpp_lib_OS)/include $@/rpp-lib/os/$(rpp_lib_OS)/include
        cp -r rpp-lib/lwip/src/include $@/rpp-lib/lwip/src/include
 
 
diff --git a/rpp-lib b/rpp-lib
index 84387148f18f67f1c9509ec7537c761a4e4a5b55..8c4b1e5b6874e89807a7d5061c6646c77c38933e 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 84387148f18f67f1c9509ec7537c761a4e4a5b55
+Subproject commit 8c4b1e5b6874e89807a7d5061c6646c77c38933e