Fix make release

diff --git a/Makefile b/Makefile
index 7481ccec5e9042820c1ecea38f320e4c16d0cb5c..683f181db692478ca5c5e231d93bd3742ff3a1a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,26 +48,29 @@ uncrustify:
 
 release: $(RELEASE_BASENAME).zip
 
+RELEASE_TARGET ?= tms570_hdk
+include rpp-lib/build/$(RELEASE_TARGET)/Makefile.config
+
 $(RELEASE_BASENAME):: lib
        @echo 'Get version from git'
        mkdir -p $@/rpp-test-sw/Debug
        $(MAKE) -C $@/rpp-test-sw/Debug -f $(CURDIR)/rpp-test-sw/Makefile.version version.h
 
+       mkdir -p $@/rpp-lib/build/$(RELEASE_TARGET)/
        mkdir -p $@/rpp-lib/rpp/
        mkdir -p $@/rpp-lib/os/$(rpp_lib_OS)
 ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
        mkdir -p $@/rpp-lib/lwip/src
 endif
 
-       cp --parents rpp-lib/rpp-lib.lib rpp-lib/common.mk $@/
+       cp --parents rpp-lib/rpp-lib.lib rpp-lib/common.mk rpp-lib/Makefile.config $@/
        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/$(rpp_lib_$(TARGET)_LD_SCRIPT) $@/rpp-lib/rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT)
+       cp --parents rpp-lib/build/$(RELEASE_TARGET)/$(TARGET_LDCMD) $@/
        cp -r rpp-lib/os/$(rpp_lib_OS)/include $@/rpp-lib/os/$(rpp_lib_OS)/include
 ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
        cp -r rpp-lib/lwip/src/include $@/rpp-lib/lwip/src/include
 endif
 
-
 lib:
-       $(MAKE) -C rpp-lib/Release
+       $(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Release