Library update

[rpp-test-sw.git] / Makefile

diff --git a/Makefile b/Makefile
index 7481ccec5e9042820c1ecea38f320e4c16d0cb5c..c2d41f622487ff69fe9ca6e61df1195a34bd0605 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,26 +48,31 @@ uncrustify:
 
 release: $(RELEASE_BASENAME).zip
 
-$(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
+RELEASE_TARGET ?= tms570_hdk
+include rpp-lib/build/$(RELEASE_TARGET)/Makefile.config
+
+RELEASE_LIB_GIT_FILES = \
+       Makefile.var \
+       build/$(RELEASE_TARGET)/$(TARGET_LDCMD) \
+       build/Makefile.rules \
+       build/Makefile.rules.arm \
+       common.mk \
+       os/$(rpp_lib_OS)/include/ \
+       rpp/include/
 
-       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
+RELEASE_LIB_GIT_FILES += lwip/src/include/
 endif
 
-       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/$(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
-ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
-       cp -r rpp-lib/lwip/src/include $@/rpp-lib/lwip/src/include
-endif
+RELEASE_LIB_GEN_FILES = Makefile.config build/$(RELEASE_TARGET)/Debug/rpp-lib.lib
+
+$(RELEASE_BASENAME):: lib
+       @echo 'Generate version.h from git'
+       mkdir -p $@/rpp-test-sw/Debug
+       $(MAKE) -C $@/rpp-test-sw/Debug -f $(CURDIR)/rpp-test-sw/Makefile.version version.h
 
+       git --git-dir=rpp-lib/.git archive --worktree-attributes --prefix=$@/rpp-lib/ HEAD $(RELEASE_LIB_GIT_FILES) | tar xf -
+       cp --parents  $(RELEASE_LIB_GEN_FILES:%=rpp-lib/%) $@/
 
 lib:
-       $(MAKE) -C rpp-lib/Release
+       $(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Release